@lvce-editor/editor-worker 19.58.1 → 19.59.1

package/dist/editorWorkerMain.js

@@ -1290,26 +1290,26 @@ const SetPatches = 'Viewlet.setPatches';
 const FocusEditorText$1 = 12;
 
 const {
-  invoke: invoke$g,
+  invoke: invoke$i,
   set: set$g
 } = create$a(DialogWorker);
 
 const {
-  invoke: invoke$f,
+  invoke: invoke$h,
   set: set$f
 } = create$a(DragAndDropWorker);
 
 const {
-  invoke: invoke$e,
+  invoke: invoke$g,
   set: set$e
 } = create$a(ErrorWorker);
 
 const {
-  invoke: invoke$d,
+  invoke: invoke$f,
   set: set$d
 } = create$a(ExtensionManagementWorker);
 const getLanguages$1 = (platform, assetDir) => {
-  return invoke$d('Extensions.getLanguages', platform, assetDir);
+  return invoke$f('Extensions.getLanguages', platform, assetDir);
 };
 
 const createLazyRpc = rpcId => {
@@ -1386,20 +1386,20 @@ const createLazyRpc = rpcId => {
 };
 
 const {
-  invoke: invoke$c,
+  invoke: invoke$e,
   set: set$c
 } = create$a(OpenerWorker);
 const openUrl = async (url, platform) => {
-  return invoke$c('Open.openUrl', url, platform);
+  return invoke$e('Open.openUrl', url, platform);
 };
 
 const {
-  invoke: invoke$b,
+  invoke: invoke$d,
   set: set$b
 } = create$a(IconThemeWorker);
 
 const {
-  invoke: invoke$a,
+  invoke: invoke$c,
   invokeAndTransfer,
   set: set$a
 } = create$a(RendererWorker);
@@ -1408,7 +1408,7 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(menuId);
   number(x);
   number(y);
-  await invoke$a('ContextMenu.show2', uid, menuId, x, y, args);
+  await invoke$c('ContextMenu.show2', uid, menuId, x, y, args);
 };
 const sendMessagePortToDragAndDropWorker = async port => {
   const command = 'DragAndDrop.handleMessagePort';
@@ -1427,16 +1427,13 @@ const sendMessagePortToErrorWorker = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToErrorWorker', port, command, rpcId);
 };
 const readFile$1 = async uri => {
-  return invoke$a('FileSystem.readFile', uri);
-};
-const handleWorkspaceRefresh = async () => {
-  return invoke$a('Layout.handleWorkspaceRefresh');
+  return invoke$c('FileSystem.readFile', uri);
 };
 const writeClipBoardText = async text => {
-  await invoke$a('ClipBoard.writeText', /* text */text);
+  await invoke$c('ClipBoard.writeText', /* text */text);
 };
 const readClipBoardText = async () => {
-  return invoke$a('ClipBoard.readText');
+  return invoke$c('ClipBoard.readText');
 };
 const sendMessagePortToTextMeasurementWorker = async port => {
   const command = 'TextMeasurement.handleMessagePort';
@@ -1447,10 +1444,10 @@ const sendMessagePortToExtensionManagementWorker$1 = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
 };
 const getPreference = async key => {
-  return await invoke$a('Preferences.get', key);
+  return await invoke$c('Preferences.get', key);
 };
 const openUri = async (uri, focus, options) => {
-  await invoke$a('Main.openUri', {
+  await invoke$c('Main.openUri', {
     ...options,
     focus,
     uri
@@ -1461,13 +1458,13 @@ const sendMessagePortToSyntaxHighlightingWorker$1 = async port => {
 };
 
 const {
-  invoke: invoke$9,
+  invoke: invoke$b,
   set: set$9
 } = create$a(MarkdownWorker);
 
 const SyntaxHighlightingWorker = {
   __proto__: null,
-  invoke: invoke$9,
+  invoke: invoke$b,
   set: set$9
 };
 
@@ -1738,7 +1735,7 @@ const activateByEvent = async (event, assetDir, platform) => {
   string(event);
   // Assert.string(assetDir)
   // Assert.number(platform)
-  await invoke$d('Extensions.activateByEvent', event);
+  await invoke$f('Extensions.activateByEvent', event);
 };
 
 const codeGeneratorAccept = state => {
@@ -2396,7 +2393,7 @@ const getEnabled$1 = () => {
 };
 
 const {
-  invoke: invoke$8,
+  invoke: invoke$a,
   set: set$6
 } = SyntaxHighlightingWorker;
 
@@ -2447,7 +2444,7 @@ const loadTokenizer = async (languageId, tokenizePath) => {
   setTokenizePath(languageId, tokenizePath);
   if (getEnabled$1()) {
     // @ts-ignore
-    const tokenMap = await invoke$8('Tokenizer.load', languageId, tokenizePath);
+    const tokenMap = await invoke$a('Tokenizer.load', languageId, tokenizePath);
     set$4(languageId, tokenMap);
     return;
   }
@@ -2635,13 +2632,13 @@ const getTokensViewport2 = async (editor, startLineIndex, endLineIndex, syncIncr
         invalidStartIndex,
         languageId
       };
-      return invoke$8('GetTokensViewport.getTokensViewport', slimEditor,
+      return invoke$a('GetTokensViewport.getTokensViewport', slimEditor,
       // @ts-ignore
       startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend);
     }
     // TODO only send needed lines of text
     // @ts-ignore
-    return invoke$8('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex, true, editor.id, editor.lines);
+    return invoke$a('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex, true, editor.id, editor.lines);
   }
   return getTokensViewport(editor, startLineIndex, endLineIndex);
 };
@@ -3332,7 +3329,7 @@ const getIncrementalEdits = async (oldState, newState) => {
       const oldLine = oldState.lines[rowIndex];
       const newLine = lines[rowIndex];
       // @ts-ignore
-      const incrementalEdits = await invoke$8(
+      const incrementalEdits = await invoke$a(
       // @ts-ignore
       'TokenizeIncremental.tokenizeIncremental', newState.uid,
       // @ts-ignore
@@ -3722,12 +3719,16 @@ const splitLines = lines => {
   return lines.split('\n');
 };
 
-const invoke$7 = (...args) => invoke$a(...args);
-const readFile = (...args) => readFile$1(...args);
+const invoke$9 = async (applicationId, method, ...args) => {
+  return applicationId === undefined ? invoke$c(method, ...args) : invoke$c('Application.execute', applicationId, method, ...args);
+};
+const readFile = async (applicationId, uri) => {
+  return applicationId === undefined ? readFile$1(uri) : invoke$9(applicationId, 'FileSystem.readFile', uri);
+};
 
-const notifyTabModifiedStatusChange = async (uri, modified) => {
+const notifyTabModifiedStatusChange = async (uri, modified, applicationId) => {
   try {
-    await invoke$7('Main.handleModifiedStatusChange', uri, modified);
+    await invoke$9(applicationId, 'Main.handleModifiedStatusChange', uri, modified);
   } catch {
     // ignore
   }
@@ -3764,7 +3765,7 @@ const measureTextWidthFast = async (text, charWidth) => {
 };
 
 const measureTextWidthSlow = async (text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth) => {
-  const width = await invoke$b('TextMeasurement.measureTextWidth', text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth);
+  const width = await invoke$d('TextMeasurement.measureTextWidth', text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth);
   return width;
 };
 
@@ -4221,7 +4222,7 @@ const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionCh
 
   // Notify main-area-worker about modified status change
   if (!editor.modified) {
-    await notifyTabModifiedStatusChange(editor.uri, true);
+    await notifyTabModifiedStatusChange(editor.uri, true, editor.applicationId);
   }
 
   // Notify registered listeners about editor changes
@@ -4459,6 +4460,10 @@ const updateColorPickerValue$1 = async (editor, value) => {
   };
 };
 
+const invoke$8 = async (applicationId, method, ...args) => {
+  return applicationId === undefined ? invoke$f(method, ...args) : invoke$f('Extensions.invokeForApplication', applicationId, method, ...args);
+};
+
 const validTypes = new Set(['added', 'deleted', 'modified']);
 const isProviderDecoration$1 = value => {
   return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
@@ -4490,7 +4495,7 @@ const getEditorGutterDecorations = async editor => {
     uri: editor.uri
   };
   try {
-    const results = await invoke$d('Extensions.executeProvidersByEvent', 'onEditorGutterDecoration', 'ExtensionApi.executeEditorGutterDecorationProvider', textDocument);
+    const results = await invoke$8(editor.applicationId, 'Extensions.executeProvidersByEvent', 'onEditorGutterDecoration', 'ExtensionApi.executeEditorGutterDecorationProvider', textDocument);
     return getProviderDecorations$1(results);
   } catch {
     return [];
@@ -4553,7 +4558,7 @@ const getLightBulbRowIndex = async editor => {
   };
   const offset = getOffsetAtCursor$1(editor);
   try {
-    const actions = await invoke$d('Extensions.executeCodeActionProviders', textDocument, offset);
+    const actions = await invoke$8(editor.applicationId, 'Extensions.executeCodeActionProviders', textDocument, offset);
     return Array.isArray(actions) && actions.length > 0 ? rowIndex : -1;
   } catch {
     return -1;
@@ -5059,7 +5064,7 @@ const getOrCreate$3 = () => {
   }
   return state$9.workerPromise;
 };
-const invoke$6 = async (method, ...params) => {
+const invoke$7 = async (method, ...params) => {
   const worker = await getOrCreate$3();
   return await worker.invoke(method, ...params);
 };
@@ -5073,10 +5078,10 @@ const loadContent$3 = async (state, parentUid) => {
     x,
     y
   } = state;
-  await invoke$6('ColorPicker.create', uid, x, y, width, height, parentUid);
-  await invoke$6('ColorPicker.loadContent', uid, value);
-  const diff = await invoke$6('ColorPicker.diff2', uid);
-  const commands = await invoke$6('ColorPicker.render2', uid, diff);
+  await invoke$7('ColorPicker.create', uid, x, y, width, height, parentUid);
+  await invoke$7('ColorPicker.loadContent', uid, value);
+  const diff = await invoke$7('ColorPicker.diff2', uid);
+  const commands = await invoke$7('ColorPicker.render2', uid, diff);
   return {
     ...state,
     commands
@@ -5100,9 +5105,12 @@ const FocusFindWidgetToggleReplace = 42;
 const SourceActions = 38;
 const FocusCodeGenerator = 52;
 
-const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
+const createEditor2 = (id, uri, x, y, width, height, platform, assetDir, _languageId, _tokenizePath, _useCache, applicationId) => {
   number(id);
   const editor = {
+    ...(applicationId !== undefined && {
+      applicationId
+    }),
     additionalFocus: 0,
     assetDir,
     bracketMatchInfos: [],
@@ -5376,10 +5384,11 @@ const get$3 = async key => {
   return value;
 };
 const update = async settings => {
-  await invoke$a('Preferences.update', settings);
+  await invoke$c('Preferences.update', settings);
 };
 
 const createEditor = async ({
+  applicationId,
   assetDir,
   columnToReveal,
   completionTriggerCharacters,
@@ -5421,6 +5430,9 @@ const createEditor = async ({
   const languages = await getLanguages(platform, assetDir);
   const computedlanguageId = getLanguageId$1(uri, languages);
   const editor = {
+    ...(applicationId !== undefined && {
+      applicationId
+    }),
     assetDir,
     bracketMatchInfos: [],
     breakPoints: [],
@@ -5868,7 +5880,7 @@ const disposeEditor = async editorUid => {
   }
   for (const widget of editor.widgets) {
     if (widget.id === ColorPicker$2) {
-      await invoke$6('ColorPicker.dispose', widget.newState.uid);
+      await invoke$7('ColorPicker.dispose', widget.newState.uid);
     }
   }
   const commands = renderWidgets$1(editor, {
@@ -6068,7 +6080,7 @@ const getOpenEditor = (currentEditor, uri) => {
   }
   for (const key of getKeys$2()) {
     const editor = get$8(Number(key))?.newState;
-    if (editor && !editor.initial && editor.uri === uri) {
+    if (editor && !editor.initial && editor.uri === uri && editor.applicationId === currentEditor.applicationId) {
       return editor;
     }
   }
@@ -6089,9 +6101,9 @@ const applyWorkspaceEdit = async (editor, changes) => {
       }
       continue;
     }
-    const text = await readFile(uri);
+    const text = await readFile(editor.applicationId, uri);
     const newText = applyEditsToText(text, edits);
-    await invoke$7('FileSystem.writeFile', uri, newText);
+    await invoke$9(editor.applicationId, 'FileSystem.writeFile', uri, newText);
   }
   return currentEditor;
 };
@@ -6116,8 +6128,8 @@ const closeWidgetsMaybe = widgets => {
 };
 
 const logError = async (error, prefix) => {
-  const prettyError = await invoke$e('Errors.prepare', error);
-  await invoke$e('Errors.print', prettyError, prefix);
+  const prettyError = await invoke$g('Errors.prepare', error);
+  await invoke$g('Errors.print', prettyError, prefix);
 };
 const logFallback = (error, prefix) => {
   if (prefix) {
@@ -6142,7 +6154,7 @@ const getFormattingEdits = async editor => {
     text: getText$1(editor),
     uri: editor.uri
   };
-  return invoke$d('Extensions.executeFormattingProvider', textDocument);
+  return invoke$8(editor.applicationId, 'Extensions.executeFormattingProvider', textDocument);
 };
 
 const expectedErrorMessage$1 = 'Failed to execute formatting provider: FormattingError:';
@@ -6432,16 +6444,16 @@ const getNewEditor = async editor => {
   return editor;
 };
 
-const isReadonlyFile = async uri => {
-  return invoke$a('FileSystem.isReadonly', uri);
+const isReadonlyFile = async (uri, applicationId) => {
+  return invoke$9(applicationId, 'FileSystem.isReadonly', uri);
 };
 
 const isUntitledFile = uri => {
   return uri.startsWith('untitled:');
 };
 
-const saveNormalFile = async (uri, content) => {
-  await invoke$a('FileSystem.writeFile', uri, content, 'utf8', false);
+const saveNormalFile = async (uri, content, applicationId) => {
+  await invoke$9(applicationId, 'FileSystem.writeFile', uri, content, 'utf8', false);
 };
 
 const showFilePicker = async platform => {
@@ -6449,21 +6461,21 @@ const showFilePicker = async platform => {
   const {
     canceled,
     filePath
-  } = await invoke$c('Open.showSaveDialog', dialogTitle, [], platform);
+  } = await invoke$e('Open.showSaveDialog', dialogTitle, [], platform);
   if (canceled) {
     return '';
   }
   return filePath;
 };
 
-const saveUntitledFile = async (uri, content, platform) => {
+const saveUntitledFile = async (uri, content, platform, applicationId) => {
   const filePath = await showFilePicker(platform);
   if (!filePath) {
     return;
   }
-  await invoke$a('FileSystem.writeFile', filePath, content);
-  await handleWorkspaceRefresh();
-  await invoke$a('Main.handleUriChange', uri, filePath);
+  await invoke$9(applicationId, 'FileSystem.writeFile', filePath, content);
+  await invoke$9(applicationId, 'Layout.handleWorkspaceRefresh');
+  await invoke$9(applicationId, 'Main.handleUriChange', uri, filePath);
   return filePath;
 };
 
@@ -6473,7 +6485,7 @@ const isPermissionDeniedError = error => {
 };
 const showSaveErrorDialog = async error => {
   if (isPermissionDeniedError(error)) {
-    await invoke$g('ElectronDialog.showMessageBox', {
+    await invoke$i('ElectronDialog.showMessageBox', {
       buttons: ['OK'],
       defaultId: 0,
       message: "You don't have permission to save changes to this file.",
@@ -6482,7 +6494,7 @@ const showSaveErrorDialog = async error => {
     });
     return;
   }
-  await invoke$g('ElectronDialog.showMessageBox', {
+  await invoke$i('ElectronDialog.showMessageBox', {
     buttons: ['OK'],
     defaultId: 0,
     detail: error.message,
@@ -6495,19 +6507,20 @@ const showSaveErrorDialog = async error => {
 const save = async editor => {
   try {
     const {
+      applicationId,
       platform,
       uri
     } = editor;
-    if (!isUntitledFile(uri) && (await isReadonlyFile(uri))) {
+    if (!isUntitledFile(uri) && (await isReadonlyFile(uri, applicationId))) {
       return editor;
     }
     const newEditor = await getNewEditor(editor);
     const content = applyLineEndings(getText$1(newEditor), newEditor.endOfLine);
     if (isUntitledFile(uri)) {
-      const pickedFilePath = await saveUntitledFile(uri, content, platform);
+      const pickedFilePath = await saveUntitledFile(uri, content, platform, applicationId);
       if (pickedFilePath) {
         if (editor.modified) {
-          await notifyTabModifiedStatusChange(uri, false);
+          await notifyTabModifiedStatusChange(uri, false, applicationId);
         }
         return {
           ...newEditor,
@@ -6517,9 +6530,9 @@ const save = async editor => {
       }
       return newEditor;
     }
-    await saveNormalFile(uri, content);
+    await saveNormalFile(uri, content, applicationId);
     if (editor.modified) {
-      await notifyTabModifiedStatusChange(uri, false);
+      await notifyTabModifiedStatusChange(uri, false, applicationId);
     }
     return {
       ...newEditor,
@@ -6576,7 +6589,7 @@ const execute = async ({
   noProviderFoundResult = undefined
 }) => {
   const textDocument = getTextDocument$3(editor);
-  const result = await invoke$d('Extensions.executeLanguageProvider', kind, method, textDocument, ...args);
+  const result = await invoke$8(editor.applicationId, 'Extensions.executeLanguageProvider', kind, method, textDocument, ...args);
   if (!result.found) {
     return noProviderFoundResult;
   }
@@ -7036,7 +7049,7 @@ const getOrCreate$2 = () => {
   }
   return state$6.workerPromise;
 };
-const invoke$5 = async (method, ...params) => {
+const invoke$6 = async (method, ...params) => {
   const worker = await getOrCreate$2();
   return await worker.invoke(method, ...params);
 };
@@ -7056,7 +7069,7 @@ const closeRename = async editor => {
     return editor;
   }
   const renameWidget = widgets[renameWidgetIndex];
-  await invoke$5('Rename.close', renameWidget.newState.uid);
+  await invoke$6('Rename.close', renameWidget.newState.uid);
   const latest = get$8(uid);
   const {
     newState
@@ -8161,7 +8174,7 @@ const deleteWordRight = editor => {
 
 const findAllReferences$1 = async editor => {
   // @ts-ignore
-  await invoke$a('SideBar.show', 'References', /* focus */true);
+  await invoke$c('SideBar.show', 'References', /* focus */true);
   return editor;
 };
 
@@ -8740,7 +8753,7 @@ const getEditorLineDecorations = async (editor, rowIndex) => {
     uri: editor.uri
   };
   try {
-    const results = await invoke$d('Extensions.executeProvidersByEvent', 'onEditorLineDecoration', 'ExtensionApi.executeEditorLineDecorationProvider', textDocument, rowIndex);
+    const results = await invoke$8(editor.applicationId, 'Extensions.executeProvidersByEvent', 'onEditorLineDecoration', 'ExtensionApi.executeEditorLineDecorationProvider', textDocument, rowIndex);
     return getProviderDecorations(results, rowIndex);
   } catch {
     return [];
@@ -8956,10 +8969,10 @@ const startTextDrag = async (state, x, y) => {
   }
   try {
     if (state.textDragId) {
-      await invoke$f('DragAndDrop.discardTextDrag', state.textDragId);
+      await invoke$h('DragAndDrop.discardTextDrag', state.textDragId);
     }
     const text = getText$1(state).slice(startOffset, endOffset);
-    const textDragId = await invoke$f('DragAndDrop.createTextDrag', {
+    const textDragId = await invoke$h('DragAndDrop.createTextDrag', {
       endOffset,
       sourceUri: state.uri,
       startOffset,
@@ -9112,7 +9125,7 @@ const getDiagnosticHoverDetail = ({
 
 const measureTextBlockHeight = async (text, fontFamily, fontSize, lineHeight, width) => {
   // @ts-ignore
-  return invoke$a('MeasureTextHeight.measureTextBlockHeight', text, fontFamily, fontSize, lineHeight, width);
+  return invoke$c('MeasureTextHeight.measureTextBlockHeight', text, fontFamily, fontSize, lineHeight, width);
 };
 
 const maximumWidth = 600;
@@ -9187,7 +9200,7 @@ const getTextDocument$2 = editor => {
 };
 const executeIsolatedHoverProvider = async (editor, offset) => {
   const textDocument = getTextDocument$2(editor);
-  return invoke$d('Extensions.executeHoverProvider', textDocument, offset);
+  return invoke$8(editor.applicationId, 'Extensions.executeHoverProvider', textDocument, offset);
 };
 const executeHoverProvider = async (editor, offset) => {
   object(editor);
@@ -9430,7 +9443,7 @@ const showHover = async (editor, position, token) => {
     return;
   }
   set$8(editor.uid, latestInstance.oldState, newEditor);
-  await invoke$a('Editor.renderPending', editor.uid);
+  await invoke$c('Editor.renderPending', editor.uid);
 };
 
 // TODO several things can happen:
@@ -9522,7 +9535,7 @@ const editorHandleNativeSelectionChange = (editor, range) => {
 const handlePointerCaptureLost = async editor => {
   if (editor.textDragId) {
     try {
-      await invoke$f('DragAndDrop.discardTextDrag', editor.textDragId);
+      await invoke$h('DragAndDrop.discardTextDrag', editor.textDragId);
     } catch {
       // The pointer state still needs to be reset if the worker is unavailable.
     }
@@ -9810,7 +9823,7 @@ const handlePointerUp = async editor => {
     return resetEditor;
   }
   try {
-    const data = await invoke$f('DragAndDrop.takeTextDrag', editor.textDragId);
+    const data = await invoke$h('DragAndDrop.takeTextDrag', editor.textDragId);
     if (!data) {
       return resetEditor;
     }
@@ -10137,7 +10150,7 @@ const indentMore = editor => {
 
 const getLanguageConfiguration = async editor => {
   // @ts-ignore
-  return invoke$a('Languages.getLanguageConfiguration', {
+  return invoke$c('Languages.getLanguageConfiguration', {
     languageId: editor.languageId,
     uri: editor.uri
   });
@@ -10371,7 +10384,7 @@ const create$3 = () => {
 };
 
 const {
-  invoke: invoke$4,
+  invoke: invoke$5,
   setFactory
 } = createLazyRpc(CompletionWorker);
 
@@ -10387,12 +10400,13 @@ const newStateGenerator$3 = async (state, parentUid) => {
     newState
   } = get$8(parentUid);
   const {
+    applicationId,
     languageId
   } = newState;
-  await invoke$4('Completions.create', uid, x, y, width, height, parentUid, languageId);
-  await invoke$4('Completions.loadContent', uid);
-  const diff = await invoke$4('Completions.diff2', uid);
-  const commands = await invoke$4('Completions.render2', uid, diff);
+  await invoke$5('Completions.create', uid, x, y, width, height, parentUid, languageId, applicationId);
+  await invoke$5('Completions.loadContent', uid);
+  const diff = await invoke$5('Completions.diff2', uid);
+  const commands = await invoke$5('Completions.render2', uid, diff);
   return {
     ...state,
     commands
@@ -10445,14 +10459,14 @@ const addWidget = (widget, id, render) => {
 };
 
 const setFocus = async focusKey => {
-  await invoke$a('Focus.setFocus', focusKey);
+  await invoke$c('Focus.setFocus', focusKey);
 };
 const unsetAdditionalFocus = async focusKey => {
   if (!focusKey) {
     return;
   }
   // @ts-ignore
-  await invoke$a('Focus.removeAdditionalFocus', focusKey);
+  await invoke$c('Focus.removeAdditionalFocus', focusKey);
 };
 
 const FocusEditor = 12;
@@ -10521,7 +10535,7 @@ const launch = async () => {
   const rpc = await launchFindWidgetWorker();
   set$h(rpcId, rpc);
 };
-const invoke$3 = async (method, ...params) => {
+const invoke$4 = async (method, ...params) => {
   const rpc = get$9(rpcId);
   return await rpc.invoke(method, ...params);
 };
@@ -10552,7 +10566,7 @@ const getOrCreate$1 = () => {
   }
   return state$2.workerPromise;
 };
-const invoke$2 = async (method, ...params) => {
+const invoke$3 = async (method, ...params) => {
   const worker = await getOrCreate$1();
   return await worker.invoke(method, ...params);
 };
@@ -10572,7 +10586,7 @@ const getOrCreate = () => {
   }
   return state$1.workerPromise;
 };
-const invoke$1 = async (method, ...params) => {
+const invoke$2 = async (method, ...params) => {
   const worker = await getOrCreate();
   return await worker.invoke(method, ...params);
 };
@@ -10580,17 +10594,17 @@ const invoke$1 = async (method, ...params) => {
 const getWidgetInvoke = widgetId => {
   switch (widgetId) {
     case ColorPicker$2:
-      return invoke$6;
+      return invoke$7;
     case Completion:
-      return invoke$4;
+      return invoke$5;
     case Find:
-      return invoke$3;
+      return invoke$4;
     case Hover:
-      return invoke$2;
+      return invoke$3;
     case Rename$1:
-      return invoke$5;
+      return invoke$6;
     case SourceAction$1:
-      return invoke$1;
+      return invoke$2;
     default:
       return undefined;
   }
@@ -10845,10 +10859,10 @@ const loadContent$2 = async (state, parentUid) => {
     y
   } = editor;
   await launch();
-  await invoke$3('FindWidget.create', uid, x, y, width, height, parentUid);
-  await invoke$3('FindWidget.loadContent', uid);
-  const diff = await invoke$3('FindWidget.diff2', uid);
-  const commands = await invoke$3('FindWidget.render2', uid, diff);
+  await invoke$4('FindWidget.create', uid, x, y, width, height, parentUid);
+  await invoke$4('FindWidget.loadContent', uid);
+  const diff = await invoke$4('FindWidget.diff2', uid);
+  const commands = await invoke$4('FindWidget.render2', uid, diff);
   return {
     ...state,
     commands
@@ -10925,10 +10939,10 @@ const newStateGenerator$1 = async (state, parentUid) => {
   const {
     languageId
   } = newState;
-  await invoke$5('Rename.create', uid, x, y, width, height, parentUid, languageId);
-  await invoke$5('Rename.loadContent', uid);
-  const diff = await invoke$5('Rename.diff2', uid);
-  const commands = await invoke$5('Rename.render2', uid, diff);
+  await invoke$6('Rename.create', uid, x, y, width, height, parentUid, languageId);
+  await invoke$6('Rename.loadContent', uid);
+  const diff = await invoke$6('Rename.diff2', uid);
+  const commands = await invoke$6('Rename.render2', uid, diff);
   return {
     ...state,
     commands
@@ -10965,7 +10979,7 @@ const getOrganizeImportEdits = async editor => {
     text: getText$1(editor),
     uri: editor.uri
   };
-  const result = await invoke$d('Extensions.executeOrganizeImportsProvider', textDocument);
+  const result = await invoke$8(editor.applicationId, 'Extensions.executeOrganizeImportsProvider', textDocument);
   return result.found ? result.result ?? [] : [];
 };
 
@@ -11549,7 +11563,7 @@ const setEndOfLine = async (editor, endOfLine) => {
     return editor;
   }
   if (!editor.modified) {
-    await notifyTabModifiedStatusChange(editor.uri, true);
+    await notifyTabModifiedStatusChange(editor.uri, true, editor.applicationId);
   }
   return {
     ...editor,
@@ -11689,7 +11703,7 @@ const executeSignatureHelpProvider = async (editor, offset) => {
   object(editor);
   number(offset);
   const textDocument = getTextDocument$1(editor);
-  return invoke$d('Extensions.executeSignatureHelpProvider', textDocument, offset);
+  return invoke$8(editor.applicationId, 'Extensions.executeSignatureHelpProvider', textDocument, offset);
 };
 
 const getSignatureHelp = async (editor, offset) => {
@@ -11825,10 +11839,10 @@ const newStateGenerator = async (state, parentUid) => {
   const {
     languageId
   } = newState;
-  await invoke$1('SourceActions.create', uid, x, y, width, height, parentUid, languageId);
-  await invoke$1('SourceActions.loadContent', uid);
-  const diff = await invoke$1('SourceActions.diff2', uid);
-  const commands = await invoke$1('SourceActions.render2', uid, diff);
+  await invoke$2('SourceActions.create', uid, x, y, width, height, parentUid, languageId);
+  await invoke$2('SourceActions.loadContent', uid);
+  const diff = await invoke$2('SourceActions.diff2', uid);
+  const commands = await invoke$2('SourceActions.render2', uid, diff);
   return {
     ...state,
     commands
@@ -13319,7 +13333,7 @@ const executeViewletCommand$1 = async (commandMap, uid, commandId, ...args) => {
     throw new TypeError(`Viewlet command not found: ${commandId}`);
   }
   await fn(uid, ...args);
-  await invoke$a('Viewlet.requestRender', uid);
+  await invoke$c('Viewlet.requestRender', uid);
 };
 
 const executeWidgetCommand = async (editor, name, method, _uid, widgetId, ...params) => {
@@ -13364,7 +13378,7 @@ const getEditorSourceActions = async editorId => {
   const {
     newState
   } = get$8(editorId);
-  const extensions = await invoke$d('Extensions.getAllExtensions', newState.assetDir, newState.platform);
+  const extensions = await invoke$8(newState.applicationId, 'Extensions.getAllExtensions', newState.assetDir, newState.platform);
   return extensions.filter(extension => !extension.disabled).flatMap(extension => extension.codeActions || []).filter(action => action.languageId === newState.languageId);
 };
 
@@ -13497,7 +13511,7 @@ const getDiagnostics$1 = async editorUid => {
 };
 
 const ensure = async (fontName, fontUrl) => {
-  await invoke$b('TextMeasurement.ensureFont', fontName, fontUrl);
+  await invoke$d('TextMeasurement.ensureFont', fontName, fontUrl);
 };
 
 const findWidgetFocusContexts = [FindWidget, FocusFindWidgetReplace$1, FocusFindWidgetOptions, FocusFindWidgetToggleReplace, FocusFindWidgetPreviousMatchButton, FocusFindWidgetNextMatchButton, FocusFindWidgetCloseButton, FocusFindWidgetReplaceButton, FocusFindWidgetReplaceAllButton];
@@ -14274,9 +14288,9 @@ const getEditorPreferences = async () => {
   };
 };
 
-const getWorkspaceUri$1 = async () => {
+const getWorkspaceUri$1 = async applicationId => {
   try {
-    return await invoke$a('Workspace.getPath');
+    return await invoke$9(applicationId, 'Workspace.getPath');
   } catch {
     return '';
   }
@@ -14312,7 +14326,7 @@ const handleSettingsChanged = async state => {
     documentSymbols = [];
     workspaceUri = '';
   } else if (!state.breadcrumbsEnabled) {
-    [documentSymbols, workspaceUri] = await Promise.all([getDocumentSymbols(editorWithUpdatedSettings), getWorkspaceUri$1()]);
+    [documentSymbols, workspaceUri] = await Promise.all([getDocumentSymbols(editorWithUpdatedSettings), getWorkspaceUri$1(state.applicationId)]);
   }
   const resizedEditor = resize({
     ...editorWithUpdatedSettings,
@@ -14357,7 +14371,7 @@ const getWidgetHotReloadDescriptor = widgetId => {
   switch (widgetId) {
     case Find:
       return {
-        invoke: invoke$3,
+        invoke: invoke$4,
         name: 'FindWidget'
       };
     default:
@@ -14487,7 +14501,7 @@ const hotReload = async () => {
 
     // TODO ask renderer worker to rerender all editors
     // @ts-ignore
-    await invoke$a(`Editor.rerender`);
+    await invoke$c(`Editor.rerender`);
   } finally {
     state.isReloading = false;
   }
@@ -14540,9 +14554,9 @@ const intialize = async (syntaxHighlightingEnabled, syncIncremental) => {
   await initializeSyntaxHighlighting(syntaxHighlightingEnabled, syncIncremental);
 };
 
-const getWorkspaceUri = async () => {
+const getWorkspaceUri = async applicationId => {
   try {
-    return await invoke$a('Workspace.getPath');
+    return await invoke$9(applicationId, 'Workspace.getPath');
   } catch {
     return '';
   }
@@ -14654,7 +14668,7 @@ const loadContent = async (state, savedState) => {
   let existingEditor;
   for (const key of getKeys$2()) {
     const editor = get$8(Number(key))?.newState;
-    if (editor && editor.id !== id && !editor.initial && editor.uri === uri) {
+    if (editor && editor.id !== id && !editor.initial && editor.uri === uri && editor.applicationId === state.applicationId) {
       existingEditor = editor;
       break;
     }
@@ -14663,7 +14677,7 @@ const loadContent = async (state, savedState) => {
   let endOfLine = existingEditor?.endOfLine || 'lf';
   try {
     if (!existingEditor) {
-      content = await readFile$1(uri);
+      content = await readFile(state.applicationId, uri);
       endOfLine = getEndOfLine(content);
       content = normalizeLineEndings(content);
     }
@@ -14698,7 +14712,7 @@ const loadContent = async (state, savedState) => {
   let documentSymbols = state.documentSymbols || [];
   let workspaceUri = state.workspaceUri || '';
   if (breadcrumbsEnabled) {
-    [documentSymbols, workspaceUri] = await Promise.all([getDocumentSymbols(newEditor3WithLinks), getWorkspaceUri()]);
+    [documentSymbols, workspaceUri] = await Promise.all([getDocumentSymbols(newEditor3WithLinks), getWorkspaceUri(state.applicationId)]);
   }
   const newEditor3WithBreadcrumbs = {
     ...newEditor3WithLinks,
@@ -14821,7 +14835,7 @@ const refreshGutterDecorationsAll = async () => {
         ...latest.newState,
         gutterDecorations: refreshedEditor.gutterDecorations
       });
-      await invoke$a('Editor.renderPending', editor.id);
+      await invoke$c('Editor.renderPending', editor.id);
     }
   }
 };
@@ -15238,7 +15252,7 @@ const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, h
     dom.push({
       childCount: textInfo.length / 2 + rowDecorations.length,
       className,
-      translate: px(difference),
+      translate: difference === 0 ? '' : px(difference),
       type: Div
     });
     for (let j = 0; j < textInfo.length; j += 2) {
@@ -16022,13 +16036,13 @@ const unregisterListener = (listenerType, rpcId) => {
   unregisterListener$1(listenerType, rpcId);
 };
 
-const invoke = async (method, ...params) => {
+const invoke$1 = async (method, ...params) => {
   const worker = get$9(DebugWorker);
   return worker.invoke(method, ...params);
 };
 
 const getDebugHighlight = async debugId => {
-  const newInfo = await invoke('RunAndDebug.getHighlight', debugId);
+  const newInfo = await invoke$1('RunAndDebug.getHighlight', debugId);
   return newInfo;
 };
 
@@ -16053,7 +16067,37 @@ const updateDebugInfo = async debugId => {
   };
   set$8(key, oldState, newEditor);
   // @ts-ignore
-  await invoke$a('Editor.rerender', key);
+  await invoke$c('Editor.rerender', key);
+};
+
+const queues = {};
+const enqueue = async (uid, callback) => {
+  const instance = get$8(uid);
+  if (!instance) {
+    return undefined;
+  }
+  const {
+    applicationId,
+    uri
+  } = instance.newState;
+  const key = JSON.stringify([applicationId ?? null, uri || uid]);
+  const previous = queues[key];
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  queues[key] = promise;
+  if (previous) {
+    await previous;
+  }
+  try {
+    return await callback();
+  } finally {
+    resolve();
+    if (queues[key] === promise) {
+      delete queues[key];
+    }
+  }
 };
 
 const getTextDocument = editor => {
@@ -16066,12 +16110,14 @@ const getTextDocument = editor => {
 };
 const executeIsolatedDiagnosticProvider = async editor => {
   const textDocument = getTextDocument(editor);
-  return invoke$d('Extensions.executeDiagnosticProvider', textDocument);
+  return invoke$8(editor.applicationId, 'Extensions.executeDiagnosticProvider', textDocument);
 };
 const executeDiagnosticProvider = async editor => {
   return executeIsolatedDiagnosticProvider(editor);
 };
 
+const invoke = (...args) => invoke$c(...args);
+
 /**
  * Merges link decorations with diagnostic decorations
  * Links should always be present, but we also need to include any diagnostic decorations
@@ -16125,9 +16171,9 @@ const handleError = async (error, editor) => {
   await handleError$1(error, 'Failed to update diagnostics: ');
   return editor;
 };
-const notifyDiagnosticsChange = async uri => {
+const notifyDiagnosticsChange = async (uri, applicationId) => {
   try {
-    await invoke$7('Layout.handleDiagnosticsChange', uri);
+    await invoke$9(applicationId, 'Layout.handleDiagnosticsChange', uri);
   } catch {
     // Older renderer workers do not support diagnostics change listeners.
   }
@@ -16145,7 +16191,7 @@ const diagnosticsEqual = (left, right) => {
   });
 };
 const diagnosticLayoutEqual = (left, right) => left.charWidth === right.charWidth && left.deltaY === right.deltaY && left.fontFamily === right.fontFamily && left.fontSize === right.fontSize && left.fontWeight === right.fontWeight && left.isMonospaceFont === right.isMonospaceFont && left.itemHeight === right.itemHeight && left.letterSpacing === right.letterSpacing && left.lines === right.lines && left.minLineY === right.minLineY && left.rowHeight === right.rowHeight && left.tabSize === right.tabSize && left.viewLineIndices === right.viewLineIndices && left.width === right.width;
-const isApplicable = (latest, editor) => latest && latest.newState.diagnosticsEnabled && latest.newState.lines === editor.lines && latest.newState.uri === editor.uri;
+const isApplicable = (latest, editor) => latest && latest.newState.diagnosticsEnabled && latest.newState.diagnostics === editor.diagnostics && latest.newState.languageId === editor.languageId && latest.newState.lines === editor.lines && latest.newState.uri === editor.uri;
 const mergeDiagnostics = (editor, editorWithDiagnostics) => ({
   ...editor,
   decorations: editorWithDiagnostics.decorations,
@@ -16159,32 +16205,34 @@ const updateDiagnostics = async editor => {
   }
   try {
     const diagnostics = await getDiagnostics(editor);
-    let latest = get$8(editor.id);
-    if (!isApplicable(latest, editor)) {
-      return editor;
-    }
-    if (diagnosticsEqual(latest.newState.diagnostics, diagnostics)) {
-      return latest.newState;
-    }
-    let calculationState = latest.newState;
-    let editorWithDiagnostics = await addDiagnostics(calculationState, diagnostics);
-    latest = get$8(editor.id);
-    while (isApplicable(latest, editor) && !diagnosticLayoutEqual(calculationState, latest.newState)) {
-      calculationState = latest.newState;
-      editorWithDiagnostics = await addDiagnostics(calculationState, diagnostics);
+    return (await enqueue(editor.id, async () => {
+      let latest = get$8(editor.id);
+      if (!isApplicable(latest, editor)) {
+        return editor;
+      }
+      if (diagnosticsEqual(latest.newState.diagnostics, diagnostics)) {
+        return latest.newState;
+      }
+      let calculationState = latest.newState;
+      let editorWithDiagnostics = await addDiagnostics(calculationState, diagnostics);
       latest = get$8(editor.id);
-    }
-    if (!isApplicable(latest, editor)) {
-      return editor;
-    }
-    if (diagnosticsEqual(latest.newState.diagnostics, diagnostics)) {
-      return latest.newState;
-    }
-    const newEditor = mergeDiagnostics(latest.newState, editorWithDiagnostics);
-    set$8(editor.id, latest.oldState, newEditor);
-    await invoke$7('Editor.renderPending', newEditor.id);
-    await notifyDiagnosticsChange(newEditor.uri);
-    return newEditor;
+      while (isApplicable(latest, editor) && !diagnosticLayoutEqual(calculationState, latest.newState)) {
+        calculationState = latest.newState;
+        editorWithDiagnostics = await addDiagnostics(calculationState, diagnostics);
+        latest = get$8(editor.id);
+      }
+      if (!isApplicable(latest, editor)) {
+        return editor;
+      }
+      if (diagnosticsEqual(latest.newState.diagnostics, diagnostics)) {
+        return latest.newState;
+      }
+      const newEditor = mergeDiagnostics(latest.newState, editorWithDiagnostics);
+      set$8(editor.id, latest.oldState, newEditor);
+      await invoke('Editor.renderPending', newEditor.id);
+      await notifyDiagnosticsChange(newEditor.uri, newEditor.applicationId);
+      return newEditor;
+    })) ?? editor;
   } catch (error) {
     return handleError(error, editor);
   }
@@ -16207,10 +16255,9 @@ const editorDiagnosticEffect = {
   apply(editor) {
     return updateDiagnostics(editor);
   },
-  isActive: (oldEditor, newEditor) => !oldEditor.initial && newEditor.diagnosticsEnabled && oldEditor.lines !== newEditor.lines
+  isActive: (oldEditor, newEditor) => !oldEditor.initial && newEditor.diagnosticsEnabled && (oldEditor.lines !== newEditor.lines || oldEditor.languageId !== newEditor.languageId)
 };
 
-const queues = {};
 const cursorUndoLimit = 100;
 const selectionsEqual = (left, right) => {
   if (left === right) {
@@ -16247,7 +16294,7 @@ const saveAfterDelay = async (uid, token) => {
   });
   await save$1(uid);
   if (didSave) {
-    await invoke$a('Editor.renderPending', uid);
+    await invoke$c('Editor.renderPending', uid);
   }
 };
 
@@ -16255,21 +16302,7 @@ const saveAfterDelay = async (uid, token) => {
 // TODO only store editor state in editor worker, not in renderer worker also
 
 const wrapCommand = (fn, preservesTypingCoalescing = false) => async (uid, ...args) => {
-  const initialInstance = get$8(uid);
-  if (!initialInstance) {
-    return undefined;
-  }
-  const queueKey = initialInstance?.newState.uri || uid;
-  const previous = queues[queueKey];
-  const {
-    promise: next,
-    resolve
-  } = Promise.withResolvers();
-  queues[queueKey] = next;
-  if (previous) {
-    await previous;
-  }
-  try {
+  return enqueue(uid, async () => {
     const oldInstance = get$8(uid);
     if (!oldInstance) {
       return undefined;
@@ -16320,7 +16353,7 @@ const wrapCommand = (fn, preservesTypingCoalescing = false) => async (uid, ...ar
         const otherUid = Number(key);
         const instance = get$8(otherUid);
         const editor = instance?.newState;
-        if (otherUid === uid || !instance || !editor || editor.initial || editor.uri !== finalEditor.uri) {
+        if (otherUid === uid || !instance || !editor || editor.initial || editor.uri !== finalEditor.uri || editor.applicationId !== finalEditor.applicationId) {
           continue;
         }
         const synchronizedEditor = await updateDerivedState(editor, {
@@ -16338,6 +16371,9 @@ const wrapCommand = (fn, preservesTypingCoalescing = false) => async (uid, ...ar
           visualDecorations: finalEditor.visualDecorations
         });
         set$8(otherUid, instance.oldState, synchronizedEditor);
+        if (editorDiagnosticEffect.isActive(editor, synchronizedEditor)) {
+          void editorDiagnosticEffect.apply(synchronizedEditor);
+        }
       }
     }
     if (lines !== finalEditor.lines && !isUntitledFile(finalEditor.uri)) {
@@ -16346,12 +16382,7 @@ const wrapCommand = (fn, preservesTypingCoalescing = false) => async (uid, ...ar
       dispose$2(uid);
     }
     return finalEditor;
-  } finally {
-    resolve();
-    if (queues[queueKey] === next) {
-      delete queues[queueKey];
-    }
-  }
+  });
 };
 
 const executeViewletCommand = (uid, commandId, ...args) => {

package/package.json

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