@lvce-editor/editor-worker 18.3.0 → 18.5.0

package/dist/editorWorkerMain.js

@@ -553,7 +553,7 @@ const execute$1 = (command, ...args) => {
 
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$8 = id => {
+const get$9 = id => {
   return callbacks[id];
 };
 const remove$9 = id => {
@@ -702,7 +702,7 @@ const warn$1 = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$8(id);
+  const fn = get$9(id);
   if (!fn) {
     console.log(response);
     warn$1(`callback ${id} may already be disposed`);
@@ -886,9 +886,9 @@ const create$h = (id, method, params) => {
   return message;
 };
 
-let id$1 = 0;
+let id = 0;
 const create$g = () => {
-  return ++id$1;
+  return ++id;
 };
 
 const registerPromise = map => {
@@ -1084,6 +1084,16 @@ const create$b = async ({
   return rpc;
 };
 
+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;
@@ -1147,11 +1157,14 @@ 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
@@ -1177,7 +1190,7 @@ const rpcs = Object.create(null);
 const set$f = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get$7 = id => {
+const get$8 = id => {
   return rpcs[id];
 };
 const remove$8 = id => {
@@ -1188,18 +1201,18 @@ const remove$8 = id => {
 const create$a = rpcId => {
   return {
     async dispose() {
-      const rpc = get$7(rpcId);
+      const rpc = get$8(rpcId);
       await rpc.dispose();
     },
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get$7(rpcId);
+      const rpc = get$8(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get$7(rpcId);
+      const rpc = get$8(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1262,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,
@@ -1555,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 () => {
@@ -1625,7 +1641,7 @@ const RendererWorker = {
   openExternal: openExternal$1,
   openNativeFolder,
   openUri,
-  openUrl,
+  openUrl: openUrl$1,
   openWidget,
   readClipBoardText,
   readFile,
@@ -1679,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);
@@ -1694,7 +1714,7 @@ const {
 const SyntaxHighlightingWorker = {
   __proto__: null,
   dispose: dispose$1,
-  invoke: invoke$b,
+  invoke: invoke$a,
   invokeAndTransfer,
   set: set$9
 };
@@ -1715,12 +1735,12 @@ const createLazyRpc = rpcId => {
   return {
     async invoke(method, ...params) {
       await ensureRpc();
-      const rpc = get$7(rpcId);
+      const rpc = get$8(rpcId);
       return rpc.invoke(method, ...params);
     },
     async invokeAndTransfer(method, ...params) {
       await ensureRpc();
-      const rpc = get$7(rpcId);
+      const rpc = get$8(rpcId);
       return rpc.invokeAndTransfer(method, ...params);
     },
     setFactory(value) {
@@ -1823,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 => {
@@ -1866,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);
 };
@@ -1879,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
@@ -1890,8 +1910,11 @@ const loadContent$3 = async (state, parentUid) => {
 };
 
 const {
+  get: get$7,
   getCommandIds,
+  registerCommands,
   set: set$8,
+  wrapCommand: wrapCommand$1,
   wrapGetter
 } = create$9();
 
@@ -1938,6 +1961,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     highlightedLine: -1,
     id,
     incrementalEdits: emptyIncrementalEdits,
+    initial: true,
     invalidStartIndex: 0,
     isAutoClosingBracketsEnabled: false,
     isAutoClosingQuotesEnabled: false,
@@ -2045,7 +2069,7 @@ const get$5 = id => {
   number(id);
   return editors[id];
 };
-const getKeys$1 = () => {
+const getKeys$2 = () => {
   return Object.keys(editors);
 };
 const set$6 = (id, oldEditor, newEditor) => {
@@ -2254,7 +2278,7 @@ const getEnabled$1 = () => {
 };
 
 const {
-  invoke: invoke$9,
+  invoke: invoke$8,
   set: set$5
 } = SyntaxHighlightingWorker;
 
@@ -2290,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;
   }
@@ -2466,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);
 };
@@ -3176,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
@@ -3354,7 +3378,7 @@ const notifyListeners = async (listenerType, method, ...params) => {
   // Notify all listeners in parallel
   const notifications = rpcIds.map(async rpcId => {
     try {
-      const rpc = get$7(rpcId);
+      const rpc = get$8(rpcId);
       if (rpc) {
         await rpc.invoke(method, ...params);
       }
@@ -3375,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
   }
@@ -3415,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;
 };
 
@@ -4072,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;
 };
 
@@ -4081,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;
 };
 
@@ -4391,6 +4410,46 @@ const createEditor = async ({
   });
 };
 
+const isEqual$2 = (oldState, newState) => {
+  return oldState.itemHeight === newState.itemHeight;
+};
+
+const isEqual$1 = (oldState, newState) => {
+  return oldState.focused === newState.focused && oldState.focus === newState.focus;
+};
+
+const isEqual = (oldState, newState) => {
+  return oldState.lines === newState.lines && oldState.textInfos === newState.textInfos && oldState.differences === newState.differences && oldState.initial === newState.initial;
+};
+
+const RenderFocus = 6;
+const RenderFocusContext = 7;
+const RenderCss = 11;
+const RenderIncremental = 12;
+
+const modules = [isEqual, isEqual$1, isEqual$1, isEqual$2];
+const numbers = [RenderIncremental, RenderFocus, RenderFocusContext, RenderCss];
+
+const diff = (oldState, newState) => {
+  const diffResult = [];
+  for (let i = 0; i < modules.length; i++) {
+    const fn = modules[i];
+    if (!fn(oldState, newState)) {
+      diffResult.push(numbers[i]);
+    }
+  }
+  return diffResult;
+};
+
+const diff2 = uid => {
+  const {
+    newState,
+    oldState
+  } = get$7(uid);
+  const result = diff(oldState, newState);
+  return result;
+};
+
 // @ts-ignore
 const getNewSelections$c = selections => {
   const newSelections = [];
@@ -5095,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');
   }
@@ -6055,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
@@ -6205,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
@@ -7325,18 +7383,18 @@ const launchFindWidgetWorker = async () => {
 const rpcId = 9002;
 const launch = async () => {
   // TODO race condition
-  if (get$7(rpcId)) {
+  if (get$8(rpcId)) {
     return;
   }
   const rpc = await launchFindWidgetWorker();
   set$f(rpcId, rpc);
 };
 const invoke$3 = async (method, ...params) => {
-  const rpc = get$7(rpcId);
+  const rpc = get$8(rpcId);
   return await rpc.invoke(method, ...params);
 };
 const dispose = async () => {
-  const rpc = get$7(rpcId);
+  const rpc = get$8(rpcId);
   remove$8(rpcId);
   if (rpc) {
     await rpc.dispose();
@@ -7495,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);
 };
@@ -7656,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;
 };
@@ -9372,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:
@@ -10278,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 = () => {
@@ -10637,8 +10694,8 @@ const getKeyBindings = () => {
   }];
 };
 
-const getKeys = () => {
-  return getKeys$1();
+const getKeys$1 = () => {
+  return getKeys$2();
 };
 
 /**
@@ -10723,7 +10780,7 @@ const getDiagnostics = editor => {
 const getProblems = async () => {
   // TODO maybe combine querying diagnostics for problems view with diagnostics for editor
   // or query the diagnostics for the problems view directtly from the extension host worker
-  const keys = getKeys$1();
+  const keys = getKeys$2();
   const editors = keys.map(key => {
     const numericKey = parseInt(key);
     const editor = get$5(numericKey);
@@ -10935,7 +10992,7 @@ const hotReload = async () => {
   isReloading = true;
 
   // TODO use getEditors
-  const keys = getKeys$1();
+  const keys = getKeys$2();
   const savedStates = await saveWidgetState(keys);
   await relaunchWorkers();
   const newEditors = await restoreWidgetState(keys, savedStates);
@@ -10950,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 () => {
@@ -10996,7 +11053,7 @@ const initializeExtensionManagementWorker = async () => {
   }
 };
 
-const send$2 = port => {
+const send$1 = port => {
   // @ts-ignore
   return sendMessagePortToOpenerWorker(port);
 };
@@ -11004,7 +11061,7 @@ const initializeOpenerWorker = async () => {
   try {
     const rpc = await create$f({
       commandMap: {},
-      send: send$2
+      send: send$1
     });
     set$b(rpc);
   } catch {
@@ -11014,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');
@@ -11047,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 () => {
@@ -11075,29 +11127,138 @@ const intialize = async (syntaxHighlightingEnabled, syncIncremental) => {
   await Promise.all([initializeSyntaxHighlighting(syntaxHighlightingEnabled, syncIncremental), initializeExtensionHost(), initializeExtensionManagementWorker(), initializeTextMeasurementWorker(), initializeOpenerWorker()]);
 };
 
-const loadContent = async (state, savedState) => {
-  const {
-    assetDir,
-    diagnosticsEnabled,
+const kLineHeight = 'editor.lineHeight';
+const kFontSize = 'editor.fontSize';
+const kFontFamily = 'editor.fontFamily';
+const kTabSize = 'editor.tabSize';
+const kLineNumbers = 'editor.lineNumbers';
+const kDiagnostics = 'editor.diagnostics';
+const kQuickSuggestions = 'editor.quickSuggestions';
+const kAutoClosingQuotes = 'editor.autoClosingQuotes';
+const kAutoClosingBrackets = 'editor.autoclosingBrackets';
+const kFontWeight = 'editor.fontWeight';
+const isAutoClosingBracketsEnabled = async () => {
+  return Boolean(await get$1(kAutoClosingBrackets));
+};
+const isAutoClosingQuotesEnabled = async () => {
+  return Boolean(await get$1(kAutoClosingQuotes));
+};
+const isQuickSuggestionsEnabled = async () => {
+  return Boolean(await get$1(kQuickSuggestions));
+};
+const isAutoClosingTagsEnabled = async () => {
+  return true;
+};
+const getRowHeight = async () => {
+  return (await get$1(kLineHeight)) || 20;
+};
+const getFontSize = async () => {
+  return (await get$1(kFontSize)) || 15; // TODO find out if it is possible to use all numeric values for settings for efficiency, maybe settings could be an array
+};
+const getFontFamily = async () => {
+  return (await get$1(kFontFamily)) || 'Fira Code';
+};
+const getLetterSpacing = async () => {
+  {
+    return 0;
+  }
+};
+const getTabSize = async () => {
+  return (await get$1(kTabSize)) || 2;
+};
+const getLineNumbers = async () => {
+  return (await get$1(kLineNumbers)) ?? false;
+};
+const getCompletionTriggerCharacters = async () => {
+  return ['.', '/'];
+};
+const diagnosticsEnabled = async () => {
+  return (await get$1(kDiagnostics)) ?? false;
+};
+const getFontWeight = async () => {
+  return (await get$1(kFontWeight)) ?? 400;
+};
+
+const getEditorPreferences = async () => {
+  const [diagnosticsEnabled$1, fontFamily, fontSize, fontWeight, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, rowHeight, tabSize, letterSpacing, completionTriggerCharacters] = await Promise.all([diagnosticsEnabled(), getFontFamily(), getFontSize(), getFontWeight(), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters()]);
+  return {
+    completionTriggerCharacters,
+    diagnosticsEnabled: diagnosticsEnabled$1,
     fontFamily,
     fontSize,
     fontWeight,
-    height,
+    isAutoClosingBracketsEnabled: isAutoClosingBracketsEnabled$1,
+    isAutoClosingQuotesEnabled: isAutoClosingQuotesEnabled$1,
+    isAutoClosingTagsEnabled: isAutoClosingTagsEnabled$1,
+    isQuickSuggestionsEnabled: isQuickSuggestionsEnabled$1,
     letterSpacing,
+    lineNumbers,
+    rowHeight,
+    tabSize
+  };
+};
+
+const getTokenizePath = (languages, languageId) => {
+  for (const language of languages) {
+    if (language?.id === languageId) {
+      return language.tokenize || '';
+    }
+  }
+  return '';
+};
+const loadContent = async (state, savedState) => {
+  const {
+    assetDir,
+    height,
+    id,
     platform,
     uri,
     width,
     x,
     y
   } = state;
+  const {
+    completionTriggerCharacters,
+    diagnosticsEnabled,
+    fontFamily,
+    fontSize,
+    fontWeight,
+    isAutoClosingBracketsEnabled,
+    isAutoClosingQuotesEnabled,
+    isAutoClosingTagsEnabled,
+    isQuickSuggestionsEnabled,
+    letterSpacing,
+    lineNumbers,
+    rowHeight,
+    tabSize
+  } = await getEditorPreferences();
   // 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,
-    languageId: computedlanguageId
+    completionTriggerCharacters,
+    diagnosticsEnabled,
+    fontFamily,
+    fontSize,
+    fontWeight,
+    isAutoClosingBracketsEnabled,
+    isAutoClosingQuotesEnabled,
+    isAutoClosingTagsEnabled,
+    isQuickSuggestionsEnabled,
+    languageId: computedLanguageId,
+    letterSpacing,
+    lineNumbers,
+    rowHeight,
+    tabSize,
+    tokenizerId: newTokenizerId
   };
   const content = await readFile(uri);
 
@@ -11128,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, languageId, content);
+  await invoke$6(TextDocumentSyncFull, uri, id, computedLanguageId, content);
 
   // TODO await promise
   if (diagnosticsEnabled) {
@@ -11138,7 +11299,8 @@ const loadContent = async (state, savedState) => {
   const completionsOnType = Boolean(completionsOnTypeRaw);
   const newEditor5 = {
     ...newEditor4,
-    completionsOnType
+    completionsOnType,
+    initial: false
   };
   return newEditor5;
 };
@@ -11209,6 +11371,319 @@ const registerListener = (listenerType, rpcId) => {
   registerListener$1(listenerType, rpcId);
 };
 
+const getCss = itemHeight => {
+  return `:root {
+  --ActivityBarItemHeight: var(--${itemHeight}px);
+}
+`;
+};
+
+const renderCss = (oldState, newState) => {
+  const {
+    itemHeight,
+    uid
+  } = newState;
+  const css = getCss(itemHeight);
+  return [SetCss$1, uid, css];
+};
+
+const renderFocus$2 = (oldState, newState) => {
+  const selector = '.EditorInput';
+  return [FocusSelector, newState.uid, selector];
+};
+
+const renderFocusContext$1 = (oldState, newState) => {
+  return [SetFocusContext$1, newState.uid, FocusExplorer];
+};
+
+const SetText = 1;
+const Replace = 2;
+const SetAttribute = 3;
+const RemoveAttribute = 4;
+const Add = 6;
+const NavigateChild = 7;
+const NavigateParent = 8;
+const RemoveChild = 9;
+const NavigateSibling = 10;
+const SetReferenceNodeUid = 11;
+
+const isKey = key => {
+  return key !== 'type' && key !== 'childCount';
+};
+
+const getKeys = node => {
+  const keys = Object.keys(node).filter(isKey);
+  return keys;
+};
+
+const arrayToTree = nodes => {
+  const result = [];
+  let i = 0;
+  while (i < nodes.length) {
+    const node = nodes[i];
+    const {
+      children,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, node.childCount || 0);
+    result.push({
+      node,
+      children
+    });
+    i += 1 + nodesConsumed;
+  }
+  return result;
+};
+const getChildrenWithCount = (nodes, startIndex, childCount) => {
+  if (childCount === 0) {
+    return {
+      children: [],
+      nodesConsumed: 0
+    };
+  }
+  const children = [];
+  let i = startIndex;
+  let remaining = childCount;
+  let totalConsumed = 0;
+  while (remaining > 0 && i < nodes.length) {
+    const node = nodes[i];
+    const nodeChildCount = node.childCount || 0;
+    const {
+      children: nodeChildren,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, nodeChildCount);
+    children.push({
+      node,
+      children: nodeChildren
+    });
+    const nodeSize = 1 + nodesConsumed;
+    i += nodeSize;
+    totalConsumed += nodeSize;
+    remaining--;
+  }
+  return {
+    children,
+    nodesConsumed: totalConsumed
+  };
+};
+
+const compareNodes = (oldNode, newNode) => {
+  const patches = [];
+  // Check if node type changed - return null to signal incompatible nodes
+  // (caller should handle this with a Replace operation)
+  if (oldNode.type !== newNode.type) {
+    return null;
+  }
+  // Handle reference nodes - special handling for uid changes
+  if (oldNode.type === Reference) {
+    if (oldNode.uid !== newNode.uid) {
+      patches.push({
+        type: SetReferenceNodeUid,
+        uid: newNode.uid
+      });
+    }
+    return patches;
+  }
+  // Handle text nodes
+  if (oldNode.type === Text$1 && newNode.type === Text$1) {
+    if (oldNode.text !== newNode.text) {
+      patches.push({
+        type: SetText,
+        value: newNode.text
+      });
+    }
+    return patches;
+  }
+  // Compare attributes
+  const oldKeys = getKeys(oldNode);
+  const newKeys = getKeys(newNode);
+  // Check for attribute changes
+  for (const key of newKeys) {
+    if (oldNode[key] !== newNode[key]) {
+      patches.push({
+        type: SetAttribute,
+        key,
+        value: newNode[key]
+      });
+    }
+  }
+  // Check for removed attributes
+  for (const key of oldKeys) {
+    if (!(key in newNode)) {
+      patches.push({
+        type: RemoveAttribute,
+        key
+      });
+    }
+  }
+  return patches;
+};
+
+const treeToArray = node => {
+  const result = [node.node];
+  for (const child of node.children) {
+    result.push(...treeToArray(child));
+  }
+  return result;
+};
+
+const diffChildren = (oldChildren, newChildren, patches) => {
+  const maxLength = Math.max(oldChildren.length, newChildren.length);
+  // Track where we are: -1 means at parent, >= 0 means at child index
+  let currentChildIndex = -1;
+  // Collect indices of children to remove (we'll add these patches at the end in reverse order)
+  const indicesToRemove = [];
+  for (let i = 0; i < maxLength; i++) {
+    const oldNode = oldChildren[i];
+    const newNode = newChildren[i];
+    if (!oldNode && !newNode) {
+      continue;
+    }
+    if (!oldNode) {
+      // Add new node - we should be at the parent
+      if (currentChildIndex >= 0) {
+        // Navigate back to parent
+        patches.push({
+          type: NavigateParent
+        });
+        currentChildIndex = -1;
+      }
+      // Flatten the entire subtree so renderInternal can handle it
+      const flatNodes = treeToArray(newNode);
+      patches.push({
+        type: Add,
+        nodes: flatNodes
+      });
+    } else if (newNode) {
+      // Compare nodes to see if we need any patches
+      const nodePatches = compareNodes(oldNode.node, newNode.node);
+      // If nodePatches is null, the node types are incompatible - need to replace
+      if (nodePatches === null) {
+        // Navigate to this child
+        if (currentChildIndex === -1) {
+          patches.push({
+            type: NavigateChild,
+            index: i
+          });
+          currentChildIndex = i;
+        } else if (currentChildIndex !== i) {
+          patches.push({
+            type: NavigateSibling,
+            index: i
+          });
+          currentChildIndex = i;
+        }
+        // Replace the entire subtree
+        const flatNodes = treeToArray(newNode);
+        patches.push({
+          type: Replace,
+          nodes: flatNodes
+        });
+        // After replace, we're at the new element (same position)
+        continue;
+      }
+      // Check if we need to recurse into children
+      const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
+      // Only navigate to this element if we need to do something
+      if (nodePatches.length > 0 || hasChildrenToCompare) {
+        // Navigate to this child if not already there
+        if (currentChildIndex === -1) {
+          patches.push({
+            type: NavigateChild,
+            index: i
+          });
+          currentChildIndex = i;
+        } else if (currentChildIndex !== i) {
+          patches.push({
+            type: NavigateSibling,
+            index: i
+          });
+          currentChildIndex = i;
+        }
+        // Apply node patches (these apply to the current element, not children)
+        if (nodePatches.length > 0) {
+          patches.push(...nodePatches);
+        }
+        // Compare children recursively
+        if (hasChildrenToCompare) {
+          diffChildren(oldNode.children, newNode.children, patches);
+        }
+      }
+    } else {
+      // Remove old node - collect the index for later removal
+      indicesToRemove.push(i);
+    }
+  }
+  // Navigate back to parent if we ended at a child
+  if (currentChildIndex >= 0) {
+    patches.push({
+      type: NavigateParent
+    });
+    currentChildIndex = -1;
+  }
+  // Add remove patches in reverse order (highest index first)
+  // This ensures indices remain valid as we remove
+  for (let j = indicesToRemove.length - 1; j >= 0; j--) {
+    patches.push({
+      type: RemoveChild,
+      index: indicesToRemove[j]
+    });
+  }
+};
+const diffTrees = (oldTree, newTree, patches, path) => {
+  // At the root level (path.length === 0), we're already AT the element
+  // So we compare the root node directly, then compare its children
+  if (path.length === 0 && oldTree.length === 1 && newTree.length === 1) {
+    const oldNode = oldTree[0];
+    const newNode = newTree[0];
+    // Compare root nodes
+    const nodePatches = compareNodes(oldNode.node, newNode.node);
+    // If nodePatches is null, the root node types are incompatible - need to replace
+    if (nodePatches === null) {
+      const flatNodes = treeToArray(newNode);
+      patches.push({
+        type: Replace,
+        nodes: flatNodes
+      });
+      return;
+    }
+    if (nodePatches.length > 0) {
+      patches.push(...nodePatches);
+    }
+    // Compare children
+    if (oldNode.children.length > 0 || newNode.children.length > 0) {
+      diffChildren(oldNode.children, newNode.children, patches);
+    }
+  } else {
+    // Non-root level or multiple root elements - use the regular comparison
+    diffChildren(oldTree, newTree, patches);
+  }
+};
+
+const removeTrailingNavigationPatches = patches => {
+  // Find the last non-navigation patch
+  let lastNonNavigationIndex = -1;
+  for (let i = patches.length - 1; i >= 0; i--) {
+    const patch = patches[i];
+    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
+      lastNonNavigationIndex = i;
+      break;
+    }
+  }
+  // Return patches up to and including the last non-navigation patch
+  return lastNonNavigationIndex === -1 ? [] : patches.slice(0, lastNonNavigationIndex + 1);
+};
+
+const diffTree = (oldNodes, newNodes) => {
+  // Step 1: Convert flat arrays to tree structures
+  const oldTree = arrayToTree(oldNodes);
+  const newTree = arrayToTree(newNodes);
+  // Step 3: Compare the trees
+  const patches = [];
+  diffTrees(oldTree, newTree, patches, []);
+  // Remove trailing navigation patches since they serve no purpose
+  return removeTrailingNavigationPatches(patches);
+};
+
 const getCursorsVirtualDom = cursors => {
   const dom = [];
   for (const translate of cursors) {
@@ -11324,6 +11799,133 @@ const getSelectionsVirtualDom = selections => {
   return dom;
 };
 
+const getEditorVirtualDom = ({
+  cursorInfos = [],
+  diagnostics = [],
+  differences,
+  gutterInfos = [],
+  highlightedLine = -1,
+  lineNumbers = true,
+  scrollBarDiagnostics = [],
+  selectionInfos = [],
+  textInfos
+}) => {
+  const cursorInfosArray = [...cursorInfos];
+  const diagnosticsArray = [...diagnostics];
+  const gutterInfosArray = [...gutterInfos];
+  const scrollBarDiagnosticsArray = [...scrollBarDiagnostics];
+  const rowsDom = getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine);
+  const cursorsDom = getCursorsVirtualDom(cursorInfosArray);
+  const selectionsDom = getSelectionsVirtualDom(selectionInfos);
+  const diagnosticsDom = getDiagnosticsVirtualDom(diagnosticsArray);
+  const gutterDom = getEditorGutterVirtualDom(gutterInfosArray);
+  const scrollBarDiagnosticsDom = getDiagnosticsVirtualDom(scrollBarDiagnosticsArray);
+  return [{
+    childCount: 2,
+    className: 'Viewlet Editor',
+    role: 'code',
+    type: Div
+  }, {
+    childCount: gutterInfosArray.length,
+    className: 'Gutter',
+    type: Div
+  }, ...gutterDom, {
+    childCount: 4,
+    className: 'EditorContent',
+    type: Div
+  }, {
+    childCount: 4,
+    className: 'EditorLayers',
+    type: Div
+  }, {
+    childCount: selectionsDom.length,
+    className: 'Selections',
+    type: Div
+  }, ...selectionsDom, {
+    childCount: textInfos.length,
+    className: 'EditorRows',
+    type: Div
+  }, ...rowsDom, {
+    childCount: cursorsDom.length,
+    className: 'LayerCursor',
+    type: Div
+  }, ...cursorsDom, {
+    childCount: diagnosticsDom.length,
+    className: 'LayerDiagnostics',
+    type: Div
+  }, ...diagnosticsDom, {
+    childCount: scrollBarDiagnosticsDom.length,
+    className: 'EditorScrollBarDiagnostics',
+    type: Div
+  }, ...scrollBarDiagnosticsDom, {
+    childCount: 1,
+    className: 'ScrollBar ScrollBarVertical',
+    type: Div
+  }, {
+    childCount: 0,
+    className: 'ScrollBarThumb ScrollBarThumbVertical',
+    type: Div
+  }, {
+    childCount: 1,
+    className: 'ScrollBar ScrollBarHorizontal',
+    type: Div
+  }, {
+    childCount: 0,
+    className: 'ScrollBarThumb ScrollBarThumbHorizontal',
+    type: Div
+  }];
+};
+
+const getDom = state => {
+  if (state.initial && state.textInfos.length === 0) {
+    return [];
+  }
+  return getEditorVirtualDom(state);
+};
+const renderIncremental = (oldState, newState) => {
+  const oldDom = getDom(oldState);
+  const newDom = getDom(newState);
+  const patches = diffTree(oldDom, newDom);
+  return [SetPatches, newState.uid, patches];
+};
+
+const getRenderer = diffType => {
+  switch (diffType) {
+    case RenderCss:
+      return renderCss;
+    case RenderFocus:
+      return renderFocus$2;
+    case RenderFocusContext:
+      return renderFocusContext$1;
+    case RenderIncremental:
+      return renderIncremental;
+    default:
+      throw new Error('unknown renderer');
+  }
+};
+
+const applyRender = (oldState, newState, diffResult) => {
+  const commands = [];
+  for (const item of diffResult) {
+    const fn = getRenderer(item);
+    const result = fn(oldState, newState);
+    if (result.length > 0) {
+      commands.push(result);
+    }
+  }
+  return commands;
+};
+
+const render2 = (uid, diffResult) => {
+  const {
+    newState,
+    oldState
+  } = get$7(uid);
+  set$8(uid, newState, newState);
+  const commands = applyRender(oldState, newState, diffResult);
+  return commands;
+};
+
 const addWidget = widget => {
   const module = get$6(widget.id);
   if (!module) {
@@ -11551,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']
@@ -11573,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
   }];
 };
@@ -11607,7 +12209,7 @@ const unregisterListener = (listenerType, rpcId) => {
 };
 
 const invoke = async (method, ...params) => {
-  const worker = get$7(DebugWorker);
+  const worker = get$8(DebugWorker);
   return worker.invoke(method, ...params);
 };
 
@@ -11617,7 +12219,7 @@ const getDebugHighlight = async debugId => {
 };
 
 const getKey = () => {
-  const keys = getKeys$1();
+  const keys = getKeys$2();
   return parseInt(keys[0]);
 };
 const updateDebugInfo = async debugId => {
@@ -11715,13 +12317,14 @@ const commandMap = {
   'Editor.deleteWordPartLeft': wrapCommand(deleteWordPartLeft),
   'Editor.deleteWordPartRight': wrapCommand(deleteWordPartRight),
   'Editor.deleteWordRight': wrapCommand(deleteWordRight),
+  'Editor.diff2': diff2,
   'Editor.executeWidgetCommand': wrapCommand(executeWidgetCommand),
   'Editor.findAllReferences': wrapCommand(findAllReferences$1),
   'Editor.format': wrapCommand(format),
   'Editor.getCommandIds': getCommandIds,
   'Editor.getDiagnostics': getDiagnostics$1,
   'Editor.getKeyBindings': getKeyBindings,
-  'Editor.getKeys': getKeys,
+  'Editor.getKeys': getKeys$1,
   'Editor.getLanguageId': getLanguageId,
   'Editor.getLines2': getLines2,
   'Editor.getMenuEntries': getMenuEntries,
@@ -11773,7 +12376,7 @@ const commandMap = {
   'Editor.indendLess': wrapCommand(indentLess),
   'Editor.indentMore': wrapCommand(indentMore),
   'Editor.insertLineBreak': wrapCommand(insertLineBreak),
-  'Editor.loadContent': loadContent,
+  'Editor.loadContent': wrapCommand$1(loadContent),
   'Editor.moveLineDown': wrapCommand(moveLineDown),
   'Editor.moveLineUp': wrapCommand(moveLineUp),
   'Editor.moveRectangleSelection': wrapCommand(moveRectangleSelection),
@@ -11791,6 +12394,7 @@ const commandMap = {
   'Editor.paste': wrapCommand(paste),
   'Editor.pasteText': wrapCommand(pasteText),
   'Editor.render': renderEditor,
+  'Editor.render2': render2,
   'Editor.renderEventListeners': renderEventListeners,
   'Editor.replaceRange': wrapCommand(replaceRange),
   'Editor.rerender': wrapCommand(rerender),
@@ -11911,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.3.0",
+  "version": "18.5.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"