@lvce-editor/editor-worker 18.4.0 → 18.5.0

package/dist/editorWorkerMain.js

@@ -1087,6 +1087,13 @@ const create$b = async ({
 const Text$1 = 12;
 const Reference = 100;
 
+const AltKey = 'event.altKey';
+const Button = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+const DeltaMode = 'event.deltaMode';
+const DeltaY = 'event.deltaY';
+
 const Backspace = 1;
 const Tab$1 = 2;
 const Enter = 3;
@@ -1150,7 +1157,6 @@ const IconThemeWorker = 7009;
 const MarkdownWorker = 300;
 const OpenerWorker = 4561;
 const RendererWorker$1 = 1;
-const TextMeasurementWorker = 7011;
 
 const FocusSelector = 'Viewlet.focusSelector';
 const SetCss$1 = 'Viewlet.setCss';
@@ -1269,6 +1275,9 @@ const {
   invoke: invoke$e,
   set: set$d
 } = create$a(ExtensionManagementWorker);
+const getLanguages$1 = (platform, assetDir) => {
+  return invoke$e('Extensions.getLanguages', platform, assetDir);
+};
 
 const {
   dispose: dispose$2,
@@ -1562,7 +1571,7 @@ const setExtensionsSearchValue = async searchValue => {
 const openExternal$1 = async uri => {
   await invoke$d('Open.openExternal', uri);
 };
-const openUrl = async uri => {
+const openUrl$1 = async uri => {
   await invoke$d('Open.openUrl', uri);
 };
 const getAllPreferences = async () => {
@@ -1632,7 +1641,7 @@ const RendererWorker = {
   openExternal: openExternal$1,
   openNativeFolder,
   openUri,
-  openUrl,
+  openUrl: openUrl$1,
   openWidget,
   readClipBoardText,
   readFile,
@@ -1686,14 +1695,18 @@ const {
   invoke: invoke$c,
   set: set$b
 } = create$a(OpenerWorker);
+const openUrl = async (url, platform) => {
+  return invoke$c('Open.openUrl', url, platform);
+};
 
 const {
+  invoke: invoke$b,
   set: set$a
 } = create$a(IconThemeWorker);
 
 const {
   dispose: dispose$1,
-  invoke: invoke$b,
+  invoke: invoke$a,
   invokeAndTransfer,
   set: set$9
 } = create$a(MarkdownWorker);
@@ -1701,7 +1714,7 @@ const {
 const SyntaxHighlightingWorker = {
   __proto__: null,
   dispose: dispose$1,
-  invoke: invoke$b,
+  invoke: invoke$a,
   invokeAndTransfer,
   set: set$9
 };
@@ -1830,7 +1843,7 @@ const activateByEvent = async (event, assetDir, platform) => {
   string(event);
   // Assert.string(assetDir)
   // Assert.number(platform)
-  await invoke$d('ExtensionHostManagement.activateByEvent', event, assetDir, platform);
+  await activateByEvent$1(event, assetDir, platform);
 };
 
 const codeGeneratorAccept = state => {
@@ -1873,7 +1886,7 @@ const getOrCreate$3 = () => {
   }
   return workerPromise$3;
 };
-const invoke$a = async (method, ...params) => {
+const invoke$9 = async (method, ...params) => {
   const worker = await getOrCreate$3();
   return await worker.invoke(method, ...params);
 };
@@ -1886,10 +1899,10 @@ const loadContent$3 = async (state, parentUid) => {
     x,
     y
   } = state;
-  await invoke$a('ColorPicker.create', uid, x, y, width, height, parentUid);
-  await invoke$a('ColorPicker.loadContent', uid);
-  const diff = await invoke$a('ColorPicker.diff2', uid);
-  const commands = await invoke$a('ColorPicker.render2', uid, diff);
+  await invoke$9('ColorPicker.create', uid, x, y, width, height, parentUid);
+  await invoke$9('ColorPicker.loadContent', uid);
+  const diff = await invoke$9('ColorPicker.diff2', uid);
+  const commands = await invoke$9('ColorPicker.render2', uid, diff);
   return {
     ...state,
     commands
@@ -1899,6 +1912,7 @@ const loadContent$3 = async (state, parentUid) => {
 const {
   get: get$7,
   getCommandIds,
+  registerCommands,
   set: set$8,
   wrapCommand: wrapCommand$1,
   wrapGetter
@@ -2264,7 +2278,7 @@ const getEnabled$1 = () => {
 };
 
 const {
-  invoke: invoke$9,
+  invoke: invoke$8,
   set: set$5
 } = SyntaxHighlightingWorker;
 
@@ -2300,7 +2314,7 @@ const loadTokenizer = async (languageId, tokenizePath) => {
   }
   if (getEnabled$1()) {
     // @ts-ignore
-    const tokenMap = await invoke$9('Tokenizer.load', languageId, tokenizePath);
+    const tokenMap = await invoke$8('Tokenizer.load', languageId, tokenizePath);
     set$3(languageId, tokenMap);
     return;
   }
@@ -2476,13 +2490,13 @@ const getTokensViewport2 = async (editor, startLineIndex, endLineIndex, syncIncr
         invalidStartIndex,
         languageId
       };
-      return invoke$9('GetTokensViewport.getTokensViewport', slimEditor,
+      return invoke$8('GetTokensViewport.getTokensViewport', slimEditor,
       // @ts-ignore
       startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend);
     }
     // TODO only send needed lines of text
     // @ts-ignore
-    return invoke$9('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex, true, editor.id, editor.lines);
+    return invoke$8('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex, true, editor.id, editor.lines);
   }
   return getTokensViewport(editor, startLineIndex, endLineIndex);
 };
@@ -3186,7 +3200,7 @@ const getIncrementalEdits = async (oldState, newState) => {
       const oldLine = oldState.lines[rowIndex];
       const newLine = lines[rowIndex];
       // @ts-ignore
-      const incrementalEdits = await invoke$9(
+      const incrementalEdits = await invoke$8(
       // @ts-ignore
       'TokenizeIncremental.tokenizeIncremental', newState.uid,
       // @ts-ignore
@@ -3385,11 +3399,11 @@ const splitLines = lines => {
 };
 
 const {
-  invoke: invoke$8} = RendererWorker;
+  invoke: invoke$7} = RendererWorker;
 
 const notifyTabModifiedStatusChange = async uri => {
   try {
-    await invoke$8('Main.handleModifiedStatusChange', uri, true);
+    await invoke$7('Main.handleModifiedStatusChange', uri, true);
   } catch {
     // ignore
   }
@@ -3425,13 +3439,8 @@ const measureTextWidthFast = async (text, charWidth) => {
   return text.length * charWidth;
 };
 
-const {
-  invoke: invoke$7,
-  setFactory: setFactory$1
-} = createLazyRpc(TextMeasurementWorker);
-
 const measureTextWidthSlow = async (text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth) => {
-  const width = await invoke$7('TextMeasurement.measureTextWidth', text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth);
+  const width = await invoke$b('TextMeasurement.measureTextWidth', text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth);
   return width;
 };
 
@@ -4082,7 +4091,7 @@ const getLanguageId$1 = (uri, languages) => {
 const getLanguages = async (platform, assetDir) => {
   number(platform);
   string(assetDir);
-  const languages = await invoke$e('Extensions.getLanguages', platform, assetDir);
+  const languages = await getLanguages$1(platform, assetDir);
   return languages;
 };
 
@@ -4091,7 +4100,7 @@ const measureCharacterWidth = async (fontWeight, fontSize, fontFamily, letterSpa
 };
 
 const get$1 = async key => {
-  const value = await invoke$d('Preferences.get', key);
+  const value = await getPreference(key);
   return value;
 };
 
@@ -5145,7 +5154,7 @@ const compositionEnd = (editor, data) => {
 const writeText = async text => {
   try {
     string(text);
-    await invoke$d('ClipBoard.writeText', /* text */text);
+    await writeClipBoardText(text);
   } catch (error) {
     throw new VError(error, 'Failed to write text to clipboard');
   }
@@ -6105,7 +6114,7 @@ const goTo = async ({
       startColumnIndex: definition.startColumnIndex,
       startRowIndex: definition.startRowIndex
     };
-    await invoke$d(/* Main.openUri */'Main.openUri', /* uri */uri, /* focus */true, context);
+    await openUri(uri, true, context);
     return editor;
   } catch (error) {
     // TODO if editor is already disposed at this point, do nothing
@@ -6255,8 +6264,7 @@ const setPosition$1 = position => {
 };
 
 const openExternal = async (url, platform) => {
-  // @ts-ignore
-  await invoke$c('Open.openUrl', url, platform);
+  await openUrl(url, platform);
 };
 
 // TODO first change cursor position, then run go to definition
@@ -7545,8 +7553,7 @@ const pasteText = (editor, text) => {
 };
 
 const paste = async editor => {
-  // @ts-ignore
-  const text = await invoke$d('ClipBoard.readText');
+  const text = await readClipBoardText();
   string(text);
   return pasteText(editor, text);
 };
@@ -7706,7 +7713,7 @@ const saveUntitledFile = async (uri, content, platform) => {
     return;
   }
   await invoke$d('FileSystem.writeFile', filePath, content);
-  await invoke$d('Layout.handleWorkspaceRefresh');
+  await handleWorkspaceRefresh();
   await invoke$d('Main.handleUriChange', uri, filePath);
   return filePath;
 };
@@ -9422,7 +9429,7 @@ const addWidget$1 = (widget, id, render) => {
 const getWidgetInvoke = widgetId => {
   switch (widgetId) {
     case ColorPicker$1:
-      return invoke$a;
+      return invoke$9;
     case Completion:
       return invoke$4;
     case Find:
@@ -10328,7 +10335,7 @@ const getDiagnostics$1 = async editorUid => {
 };
 
 const ensure = async (fontName, fontUrl) => {
-  await invoke$7('TextMeasurement.ensureFont', fontName, fontUrl);
+  await invoke$b('TextMeasurement.ensureFont', fontName, fontUrl);
 };
 
 const getKeyBindings = () => {
@@ -11000,7 +11007,7 @@ const hotReload = async () => {
 };
 
 const sendMessagePortToExtensionHostWorker2 = async (port, initialCommand, rpcId) => {
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, initialCommand, rpcId);
+  await sendMessagePortToExtensionHostWorker(port, rpcId);
 };
 
 const createExtensionHostRpc = async () => {
@@ -11046,7 +11053,7 @@ const initializeExtensionManagementWorker = async () => {
   }
 };
 
-const send$2 = port => {
+const send$1 = port => {
   // @ts-ignore
   return sendMessagePortToOpenerWorker(port);
 };
@@ -11054,7 +11061,7 @@ const initializeOpenerWorker = async () => {
   try {
     const rpc = await create$f({
       commandMap: {},
-      send: send$2
+      send: send$1
     });
     set$b(rpc);
   } catch {
@@ -11064,10 +11071,9 @@ const initializeOpenerWorker = async () => {
 
 const sendMessagePortToSyntaxHighlightingWorker = async port => {
   try {
-    await invokeAndTransfer$1(
-    // @ts-ignore
-    'SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort2');
+    await sendMessagePortToSyntaxHighlightingWorker$1(port);
   } catch {
+    // deprecated
     await invokeAndTransfer$1(
     // @ts-ignore
     'SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort');
@@ -11097,19 +11103,15 @@ const initializeSyntaxHighlighting = async (syntaxHighlightingEnabled, syncIncre
   }
 };
 
-const send$1 = port => {
+const send = port => {
   return sendMessagePortToTextMeasurementWorker(port);
 };
 const initializeTextMeasurementWorker = async () => {
-  try {
-    const rpc = await create$f({
-      commandMap: {},
-      send: send$1
-    });
-    set$a(rpc);
-  } catch {
-    // ignore
-  }
+  const rpc = await create$f({
+    commandMap: {},
+    send
+  });
+  set$a(rpc);
 };
 
 const launchCompletionWorker = async () => {
@@ -11196,6 +11198,14 @@ const getEditorPreferences = async () => {
   };
 };
 
+const getTokenizePath = (languages, languageId) => {
+  for (const language of languages) {
+    if (language?.id === languageId) {
+      return language.tokenize || '';
+    }
+  }
+  return '';
+};
 const loadContent = async (state, savedState) => {
   const {
     assetDir,
@@ -11225,7 +11235,12 @@ const loadContent = async (state, savedState) => {
   // TODO support overwriting language id by setting it explicitly or via settings
   const charWidth = await measureCharacterWidth(fontWeight, fontSize, fontFamily, letterSpacing);
   const languages = await getLanguages(platform, assetDir);
-  const computedlanguageId = getLanguageId$1(uri, languages);
+  const computedLanguageId = getLanguageId$1(uri, languages);
+  const tokenizePath = getTokenizePath(languages, computedLanguageId);
+  await loadTokenizer(computedLanguageId, tokenizePath);
+  const tokenizer = getTokenizer(computedLanguageId);
+  const newTokenizerId = state.tokenizerId + 1;
+  set$2(newTokenizerId, tokenizer);
   const newEditor0 = {
     ...state,
     charWidth,
@@ -11238,11 +11253,12 @@ const loadContent = async (state, savedState) => {
     isAutoClosingQuotesEnabled,
     isAutoClosingTagsEnabled,
     isQuickSuggestionsEnabled,
-    languageId: computedlanguageId,
+    languageId: computedLanguageId,
     letterSpacing,
     lineNumbers,
     rowHeight,
-    tabSize
+    tabSize,
+    tokenizerId: newTokenizerId
   };
   const content = await readFile(uri);
 
@@ -11273,7 +11289,7 @@ const loadContent = async (state, savedState) => {
   // TODO only sync when needed
   // e.g. it might not always be necessary to send text to extension host worker
   // @ts-ignore
-  await invoke$6(TextDocumentSyncFull, uri, id, computedlanguageId, content);
+  await invoke$6(TextDocumentSyncFull, uri, id, computedLanguageId, content);
 
   // TODO await promise
   if (diagnosticsEnabled) {
@@ -11861,7 +11877,7 @@ const getEditorVirtualDom = ({
 };
 
 const getDom = state => {
-  if (state.initial) {
+  if (state.initial && state.textInfos.length === 0) {
     return [];
   }
   return getEditorVirtualDom(state);
@@ -12137,7 +12153,7 @@ const renderEventListeners = () => {
     params: ['handleFocus']
   }, {
     name: HandleMouseMove,
-    params: ['handleInput', 'event.clientX', 'event.clientY', 'event.altKey']
+    params: ['handleInput', ClientX, ClientY, AltKey]
   }, {
     name: HandleBlur,
     params: ['handleBlur']
@@ -12159,11 +12175,11 @@ const renderEventListeners = () => {
     preventDefault: true
   }, {
     name: HandleWheel,
-    params: ['setDelta', 'event.deltaMode', 'event.deltaY'],
-    preventDefault: true
+    params: ['setDelta', DeltaMode, DeltaY],
+    passive: true
   }, {
     name: HandleContextMenu,
-    params: ['handleContextMenu', 'event.button', 'event.clientX', 'event.clientY'],
+    params: ['handleContextMenu', Button, ClientX, ClientY],
     preventDefault: true
   }];
 };
@@ -12499,25 +12515,15 @@ const commandMap = {
   'Listener.unregister': unregisterListener,
   'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker': sendMessagePortToExtensionHostWorker2
 };
-
-const send = port => {
-  // @ts-ignore
-  return sendMessagePortToTextMeasurementWorker(port);
-};
-const createTextMeasurementWorkerRpc = async () => {
-  try {
-    const rpc = await create$c({
-      commandMap: {},
-      send
-    });
-    return rpc;
-  } catch (error) {
-    throw new VError(error, `Failed to create text measurement worker rpc`);
+for (const [key, value] of Object.entries(commandMap)) {
+  if (key.startsWith('Editor.')) {
+    // @ts-ignore
+    commandMap['EditorText' + key.slice('Editor'.length)] = value;
   }
-};
+}
 
 const listen = async () => {
-  setFactory$1(createTextMeasurementWorkerRpc);
+  registerCommands(commandMap);
   const rpc = await create$b({
     commandMap: commandMap
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "18.4.0",
+  "version": "18.5.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"