@lvce-editor/editor-worker 18.4.0 → 18.6.0

package/dist/editorWorkerMain.js

@@ -575,12 +575,12 @@ const getErrorConstructor = (message, type) => {
     switch (type) {
       case DomException:
         return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
       case ReferenceError$1:
         return ReferenceError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case TypeError$1:
+        return TypeError;
       default:
         return Error;
     }
@@ -736,27 +736,27 @@ const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
       code: MethodNotFound,
-      message: error.message,
-      data: error.stack
+      data: error.stack,
+      message: error.message
     };
   }
   return {
     code: Custom,
-    message: prettyError.message,
     data: {
-      stack: getStack(prettyError),
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
       code: prettyError.code,
-      name: prettyError.name
-    }
+      codeFrame: prettyError.codeFrame,
+      name: prettyError.name,
+      stack: getStack(prettyError),
+      type: getErrorType(prettyError)
+    },
+    message: prettyError.message
   };
 };
 const create$1$1 = (id, error) => {
   return {
-    jsonrpc: Two$1,
+    error,
     id,
-    error
+    jsonrpc: Two$1
   };
 };
 const getErrorResponse = (id, error, preparePrettyError, logError) => {
@@ -767,8 +767,8 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
 };
 const create$j = (message, result) => {
   return {
-    jsonrpc: Two$1,
     id: message.id,
+    jsonrpc: Two$1,
     result: result ?? null
   };
 };
@@ -778,14 +778,14 @@ const getSuccessResponse = (message, result) => {
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two$1,
-    id,
     error: {
       code: Custom,
+      data: error,
       // @ts-ignore
-      message: error.message,
-      data: error
-    }
+      message: error.message
+    },
+    id,
+    jsonrpc: Two$1
   };
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
@@ -815,35 +815,35 @@ const normalizeParams = args => {
   if (args.length === 1) {
     const options = args[0];
     return {
+      execute: options.execute,
       ipc: options.ipc,
+      logError: options.logError || defaultLogError,
       message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
       preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
+      requiresSocket: options.requiresSocket || defaultRequiresSocket,
+      resolve: options.resolve || defaultResolve
     };
   }
   return {
+    execute: args[2],
     ipc: args[0],
+    logError: args[5],
     message: args[1],
-    execute: args[2],
-    resolve: args[3],
     preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
+    requiresSocket: args[6],
+    resolve: args[3]
   };
 };
 const handleJsonRpcMessage = async (...args) => {
   const options = normalizeParams(args);
   const {
-    message,
-    ipc,
     execute,
-    resolve,
-    preparePrettyError,
+    ipc,
     logError,
-    requiresSocket
+    message,
+    preparePrettyError,
+    requiresSocket,
+    resolve
   } = options;
   if ('id' in message) {
     if ('method' in message) {
@@ -904,7 +904,6 @@ const registerPromise = map => {
   };
 };
 
-// @ts-ignore
 const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
   const {
     id,
@@ -986,6 +985,41 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
+const create$f = async ({
+  commandMap,
+  isMessagePortOpen = true,
+  messagePort
+}) => {
+  // TODO create a commandMap per rpc instance
+  register(commandMap);
+  const rawIpc = await IpcParentWithMessagePort$1.create({
+    isMessagePortOpen,
+    messagePort
+  });
+  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
+  messagePort.start();
+  return rpc;
+};
+
+const create$e = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
+  return create$f({
+    commandMap,
+    isMessagePortOpen,
+    messagePort: port2
+  });
+};
+
 const createSharedLazyRpc = factory => {
   let rpcPromise;
   const getOrCreate = () => {
@@ -1014,13 +1048,13 @@ const createSharedLazyRpc = factory => {
   };
 };
 
-const create$f = async ({
+const create$d = async ({
   commandMap,
   isMessagePortOpen,
   send
 }) => {
   return createSharedLazyRpc(() => {
-    return create$c({
+    return create$e({
       commandMap,
       isMessagePortOpen,
       send
@@ -1028,51 +1062,16 @@ const create$f = async ({
   });
 };
 
-const create$e = async ({
-  commandMap,
-  isMessagePortOpen = true,
-  messagePort
-}) => {
-  // TODO create a commandMap per rpc instance
-  register(commandMap);
-  const rawIpc = await IpcParentWithMessagePort$1.create({
-    isMessagePortOpen,
-    messagePort
-  });
-  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
-  handleIpc(ipc);
-  const rpc = createRpc(ipc);
-  messagePort.start();
-  return rpc;
-};
-
-const create$d = async ({
+const create$c = async ({
   commandMap,
   messagePort
 }) => {
-  return create$e({
+  return create$f({
     commandMap,
     messagePort
   });
 };
 
-const create$c = async ({
-  commandMap,
-  isMessagePortOpen,
-  send
-}) => {
-  const {
-    port1,
-    port2
-  } = new MessageChannel();
-  await send(port1);
-  return create$e({
-    commandMap,
-    isMessagePortOpen,
-    messagePort: port2
-  });
-};
-
 const create$b = async ({
   commandMap
 }) => {
@@ -1084,63 +1083,8 @@ const create$b = async ({
   return rpc;
 };
 
-const Text$1 = 12;
-const Reference = 100;
-
-const Backspace = 1;
-const Tab$1 = 2;
-const Enter = 3;
-const Escape = 8;
-const Space$1 = 9;
-const End = 255;
-const Home = 12;
-const LeftArrow = 13;
-const UpArrow = 14;
-const RightArrow = 15;
-const DownArrow = 16;
-const Delete$1 = 18;
-const KeyA = 29;
-const KeyC = 31;
-const KeyD = 32;
-const KeyF = 34;
-const KeyH = 36;
-const KeyJ = 38;
-const KeyK = 39;
-const KeyL = 40;
-const KeyO = 43;
-const KeyV = 50;
-const KeyX = 52;
-const KeyZ = 54;
-const F2 = 58;
-const F3 = 59;
-const F4 = 60;
-const F12 = 68;
-const Period = 87;
-const Slash$1 = 88;
-const BracketLeft = 90;
-const BracketRight = 92;
-
-const CodeGenerator = 1;
-const ColorPicker$1 = 2;
-const Completion = 3;
-const CompletionDetail = 4;
-const Find = 5;
-const Hover = 6;
-const Rename$1 = 7;
-const SourceAction$1 = 8;
-
 const Script$1 = 2;
 
-const CtrlCmd = 1 << 11 >>> 0;
-const Shift = 1 << 10 >>> 0;
-const Alt$1 = 1 << 9 >>> 0;
-
-const Editor$1 = 3;
-const SourceControl = 22;
-
-const Separator = 1;
-const None = 0;
-
 const CompletionWorker = 301;
 const DebugWorker = 55;
 const EditorWorker = 99;
@@ -1150,15 +1094,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';
-const SetFocusContext$1 = 'Viewlet.setFocusContext';
-const SetPatches = 'Viewlet.setPatches';
-
-const FocusEditorText$1 = 12;
-const FocusExplorer = 13;
 
 const createMockRpc = ({
   commandMap
@@ -1269,6 +1204,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,
@@ -1283,6 +1221,9 @@ const searchFileHtml = async uri => {
 const getFilePathElectron = async file => {
   return invoke$d('FileSystemHandle.getFilePathElectron', file);
 };
+const handleModifiedStatusChange = async (uri, modified) => {
+  return invoke$d('Main.handleModifiedStatusChange', uri, modified);
+};
 /**
  * @deprecated
  */
@@ -1386,6 +1327,9 @@ const disableExtension = async id => {
 const enableExtension = async id => {
   return invoke$d('ExtensionManagement.enable', id);
 };
+const disposeEditor = async uid => {
+  return invoke$d('Viewlet.dispose', uid);
+};
 const handleDebugChange = async params => {
   return invoke$d('Run And Debug.handleChange', params);
 };
@@ -1398,10 +1342,31 @@ const handleWorkspaceRefresh = async () => {
 const closeWidget = async widgetId => {
   return invoke$d('Viewlet.closeWidget', widgetId);
 };
+const createViewlet = async (viewletModuleId, editorUid, tabId, bounds, uri) => {
+  return invoke$d('Layout.createViewlet', viewletModuleId, editorUid, tabId, bounds, uri);
+};
 const sendMessagePortToExtensionHostWorker = async (port, rpcId = 0) => {
   const command = 'HandleMessagePort.handleMessagePort2';
   await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
 };
+const getViewletModuleId = async uri => {
+  return invoke$d('Layout.getModuleId', uri);
+};
+const showPanel = async () => {
+  return invoke$d('Layout.showPanel');
+};
+const showPreview = async () => {
+  return invoke$d('Layout.showPreview');
+};
+const saveEditor = async () => {
+  return invoke$d('Editor.save');
+};
+const togglePanelView = async id => {
+  return invoke$d('Panel.toggleView', id);
+};
+const resizeViewlet = async (uid, dimensions) => {
+  return invoke$d('Viewlet.resize', uid, dimensions);
+};
 const sendMessagePortToFileSearchWorker = async (port, rpcId = 0) => {
   const command = 'QuickPick.handleMessagePort';
   await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSearchWorker', port, command, rpcId);
@@ -1422,6 +1387,12 @@ const getKeyBindings$1 = async () => {
 const writeClipBoardText = async text => {
   await invoke$d('ClipBoard.writeText', /* text */text);
 };
+const writeFile = async (uri, text) => {
+  await invoke$d('FileSystem.writeFile', uri, text);
+};
+const handleUriChange = async (uri, newUri) => {
+  await invoke$d('Main.handleUriChange', uri, newUri);
+};
 const readClipBoardText = async () => {
   return invoke$d('ClipBoard.readText');
 };
@@ -1550,6 +1521,9 @@ const unmaximizeWindow = async () => {
 const maximizeWindow = async () => {
   return invoke$d('ElectronWindow.maximize');
 };
+const showSideBar = async (id, focus) => {
+  return invoke$d('SideBar.show', id, focus);
+};
 const closeWindow = async () => {
   return invoke$d('ElectronWindow.close');
 };
@@ -1562,7 +1536,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 () => {
@@ -1588,8 +1562,10 @@ const RendererWorker = {
   closeWidget,
   closeWindow,
   confirm,
+  createViewlet,
   disableExtension,
   dispose: dispose$2,
+  disposeEditor,
   enableExtension,
   getActiveEditorId,
   getAllExtensions,
@@ -1614,6 +1590,7 @@ const RendererWorker = {
   getPreference,
   getRecentlyOpened,
   getV8Version,
+  getViewletModuleId,
   getWebViewSecret,
   getWindowId,
   getWorkspacePath,
@@ -1621,6 +1598,8 @@ const RendererWorker = {
   handleDebugPaused,
   handleDebugResumed,
   handleDebugScriptParsed,
+  handleModifiedStatusChange,
+  handleUriChange,
   handleWorkspaceRefresh,
   installExtension,
   invoke: invoke$d,
@@ -1632,7 +1611,7 @@ const RendererWorker = {
   openExternal: openExternal$1,
   openNativeFolder,
   openUri,
-  openUrl,
+  openUrl: openUrl$1,
   openWidget,
   readClipBoardText,
   readFile,
@@ -1641,6 +1620,8 @@ const RendererWorker = {
   registerWebViewInterceptor,
   renderMarkdown,
   rerenderEditor,
+  resizeViewlet,
+  saveEditor,
   searchFileFetch,
   searchFileHtml,
   searchFileMemory,
@@ -1674,36 +1655,57 @@ const RendererWorker = {
   showContextMenu2,
   showErrorDialog,
   showMessageBox,
+  showPanel,
+  showPreview,
   showSaveFilePicker,
+  showSideBar,
+  togglePanelView,
   uninstallExtension,
   unmaximizeWindow,
   unregisterWebViewInterceptor,
   writeClipBoardImage,
-  writeClipBoardText
+  writeClipBoardText,
+  writeFile
 };
 
 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);
+const tokenizeIncremental = (uid, languageId, oldLine, newLine, rowIndex, minLineY) => {
+  return invoke$a('TokenizeIncremental.tokenizeIncremental', uid, languageId, oldLine, newLine, rowIndex, minLineY);
+};
+const getTokensViewPort = (slimEditor, startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend) => {
+  return invoke$a('GetTokensViewport.getTokensViewport', slimEditor, startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend);
+};
+const loadTokenizer$1 = (languageId, tokenizerPath) => {
+  return invoke$a('Tokenizer.load', languageId, tokenizerPath);
+};
 
 const SyntaxHighlightingWorker = {
   __proto__: null,
   dispose: dispose$1,
-  invoke: invoke$b,
+  getTokensViewPort,
+  invoke: invoke$a,
   invokeAndTransfer,
-  set: set$9
+  loadTokenizer: loadTokenizer$1,
+  set: set$9,
+  tokenizeIncremental
 };
 
 const createLazyRpc = rpcId => {
@@ -1776,7 +1778,7 @@ const create$9 = () => {
     },
     getKeys() {
       return Object.keys(states).map(key => {
-        return Number.parseInt(key);
+        return Number.parseFloat(key);
       });
     },
     registerCommands(commandMap) {
@@ -1818,6 +1820,37 @@ const create$9 = () => {
         return fn(newState, ...args);
       };
       return wrapped;
+    },
+    wrapLoadContent(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          newState,
+          oldState
+        } = states[uid];
+        const result = await fn(newState, ...args);
+        const {
+          error,
+          state
+        } = result;
+        if (oldState === state || newState === state) {
+          return {
+            error
+          };
+        }
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...state
+        };
+        states[uid] = {
+          newState: latestNew,
+          oldState: latestOld.oldState
+        };
+        return {
+          error
+        };
+      };
+      return wrapped;
     }
   };
 };
@@ -1830,7 +1863,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 => {
@@ -1841,7 +1874,7 @@ const codeGeneratorAccept = state => {
 const ModuleWorkerAndWorkaroundForChromeDevtoolsBug = 6;
 
 const launchWorker = async (name, url, intializeCommand) => {
-  const rpc = await create$c({
+  const rpc = await create$e({
     commandMap: {},
     isMessagePortOpen: true,
     async send(port) {
@@ -1873,7 +1906,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 +1919,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 +1932,7 @@ const loadContent$3 = async (state, parentUid) => {
 const {
   get: get$7,
   getCommandIds,
+  registerCommands,
   set: set$8,
   wrapCommand: wrapCommand$1,
   wrapGetter
@@ -1906,7 +1940,7 @@ const {
 
 const emptyIncrementalEdits = [];
 
-const ColorPicker = 41;
+const ColorPicker$1 = 41;
 const EditorCompletion = 9;
 const Empty = 0;
 const FindWidget = 16;
@@ -1990,6 +2024,73 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
   set$8(id, editor, editor);
 };
 
+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;
+const Escape = 8;
+const Space$1 = 9;
+const End = 255;
+const Home = 12;
+const LeftArrow = 13;
+const UpArrow = 14;
+const RightArrow = 15;
+const DownArrow = 16;
+const Delete$1 = 18;
+const KeyA = 29;
+const KeyC = 31;
+const KeyD = 32;
+const KeyF = 34;
+const KeyH = 36;
+const KeyJ = 38;
+const KeyK = 39;
+const KeyL = 40;
+const KeyO = 43;
+const KeyV = 50;
+const KeyX = 52;
+const KeyZ = 54;
+const F2 = 58;
+const F3 = 59;
+const F4 = 60;
+const F12 = 68;
+const Period = 87;
+const Slash$1 = 88;
+const BracketLeft = 90;
+const BracketRight = 92;
+
+const CodeGenerator = 1;
+const ColorPicker = 2;
+const Completion = 3;
+const CompletionDetail = 4;
+const Find = 5;
+const Hover = 6;
+const Rename$1 = 7;
+const SourceAction$1 = 8;
+
+const CtrlCmd = 1 << 11 >>> 0;
+const Shift = 1 << 10 >>> 0;
+const Alt$1 = 1 << 9 >>> 0;
+
+const Editor$1 = 3;
+const SourceControl = 22;
+
+const Separator = 1;
+const None = 0;
+
+const FocusSelector = 'Viewlet.focusSelector';
+const SetCss$1 = 'Viewlet.setCss';
+const SetFocusContext$1 = 'Viewlet.setFocusContext';
+const SetPatches = 'Viewlet.setPatches';
+
+const FocusEditorText$1 = 12;
+const FocusExplorer = 13;
+
 // TODO use numeric enum
 const CompositionUpdate = 'compositionUpdate';
 const ContentEditableInput = 'contentEditableInput';
@@ -2264,7 +2365,7 @@ const getEnabled$1 = () => {
 };
 
 const {
-  invoke: invoke$9,
+  invoke: invoke$8,
   set: set$5
 } = SyntaxHighlightingWorker;
 
@@ -2300,7 +2401,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 +2577,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 +3287,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 +3486,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 +3526,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 +4178,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 +4187,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;
 };
 
@@ -5064,7 +5160,7 @@ const create$7 = () => {
 const create$6 = () => {
   const completionUid = create$7();
   const widget = {
-    id: ColorPicker$1,
+    id: ColorPicker,
     newState: {
       commands: [],
       height: 0,
@@ -5089,7 +5185,7 @@ const newStateGenerator$6 = (state, parentUid) => {
   return loadContent$3(state, parentUid);
 };
 const openColorPicker = async editor => {
-  return addWidgetToEditor(ColorPicker$1, ColorPicker, editor, create$6, newStateGenerator$6);
+  return addWidgetToEditor(ColorPicker, ColorPicker$1, editor, create$6, newStateGenerator$6);
 };
 
 const state$4 = {
@@ -5145,7 +5241,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 +6201,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 +6351,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 +7640,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 +7800,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;
 };
@@ -9376,7 +9470,7 @@ const editorUnindent = editor => {
 
 const isFunctional = widgetId => {
   switch (widgetId) {
-    case ColorPicker$1:
+    case ColorPicker:
     case Completion:
     case Find:
     case Hover:
@@ -9421,8 +9515,8 @@ const addWidget$1 = (widget, id, render) => {
 
 const getWidgetInvoke = widgetId => {
   switch (widgetId) {
-    case ColorPicker$1:
-      return invoke$a;
+    case ColorPicker:
+      return invoke$9;
     case Completion:
       return invoke$4;
     case Find:
@@ -9898,13 +9992,13 @@ const HandleWheel = 'handleWheel';
 const Div = 4;
 const Input = 6;
 const Span = 8;
-const Text = 12;
+const Text$1 = 12;
 
 const text = data => {
   return {
     childCount: 0,
     text: data,
-    type: Text
+    type: Text$1
   };
 };
 
@@ -10328,7 +10422,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 = () => {
@@ -10886,7 +10980,7 @@ const handleBeforeInput = (editor, inputType, data) => {
 };
 
 const handleMessagePort = async (port, rpcId) => {
-  const rpc = await create$d({
+  const rpc = await create$c({
     commandMap: {},
     messagePort: port
   });
@@ -11000,13 +11094,13 @@ const hotReload = async () => {
 };
 
 const sendMessagePortToExtensionHostWorker2 = async (port, initialCommand, rpcId) => {
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, initialCommand, rpcId);
+  await sendMessagePortToExtensionHostWorker(port, rpcId);
 };
 
 const createExtensionHostRpc = async () => {
   try {
     const initialCommand = 'HandleMessagePort.handleMessagePort2';
-    const rpc = await create$c({
+    const rpc = await create$e({
       commandMap: {},
       async send(port) {
         await sendMessagePortToExtensionHostWorker2(port, initialCommand, EditorWorker);
@@ -11025,7 +11119,7 @@ const initializeExtensionHost = async () => {
 
 const createExtensionManagementWorkerRpc = async () => {
   try {
-    const rpc = await create$c({
+    const rpc = await create$e({
       commandMap: {},
       async send(port) {
         await sendMessagePortToExtensionManagementWorker(port, EditorWorker);
@@ -11046,15 +11140,15 @@ const initializeExtensionManagementWorker = async () => {
   }
 };
 
-const send$2 = port => {
+const send$1 = port => {
   // @ts-ignore
   return sendMessagePortToOpenerWorker(port);
 };
 const initializeOpenerWorker = async () => {
   try {
-    const rpc = await create$f({
+    const rpc = await create$d({
       commandMap: {},
-      send: send$2
+      send: send$1
     });
     set$b(rpc);
   } catch {
@@ -11064,10 +11158,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');
@@ -11076,7 +11169,7 @@ const sendMessagePortToSyntaxHighlightingWorker = async port => {
 
 const createSyntaxHighlightingWorkerRpc = async () => {
   try {
-    const rpc = await create$c({
+    const rpc = await create$e({
       commandMap: {},
       send: sendMessagePortToSyntaxHighlightingWorker
     });
@@ -11097,19 +11190,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$d({
+    commandMap: {},
+    send
+  });
+  set$a(rpc);
 };
 
 const launchCompletionWorker = async () => {
@@ -11196,6 +11285,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 +11322,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 +11340,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 +11376,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) {
@@ -11380,6 +11483,9 @@ const renderFocusContext$1 = (oldState, newState) => {
   return [SetFocusContext$1, newState.uid, FocusExplorer];
 };
 
+const Text = 12;
+const Reference = 100;
+
 const SetText = 1;
 const Replace = 2;
 const SetAttribute = 3;
@@ -11468,7 +11574,7 @@ const compareNodes = (oldNode, newNode) => {
     return patches;
   }
   // Handle text nodes
-  if (oldNode.type === Text$1 && newNode.type === Text$1) {
+  if (oldNode.type === Text && newNode.type === Text) {
     if (oldNode.text !== newNode.text) {
       patches.push({
         type: SetText,
@@ -11861,7 +11967,7 @@ const getEditorVirtualDom = ({
 };
 
 const getDom = state => {
-  if (state.initial) {
+  if (state.initial && state.textInfos.length === 0) {
     return [];
   }
   return getEditorVirtualDom(state);
@@ -12137,7 +12243,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 +12265,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 +12605,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
   });
@@ -12819,7 +12915,7 @@ const EditorHoverWidget = {
 };
 
 const registerWidgets = () => {
-  set$7(ColorPicker$1, EditorColorPickerWidget);
+  set$7(ColorPicker, EditorColorPickerWidget);
   set$7(Completion, EditorCompletionWidget);
   set$7(CompletionDetail, EditorCompletionDetailWidget);
   set$7(Find, EditorFindWidget);

package/package.json

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