@lvce-editor/editor-worker 19.28.2 → 19.29.0

package/dist/editorWorkerMain.js

@@ -559,7 +559,7 @@ const execute$1 = (command, ...args) => {
 
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$9 = id => {
+const get$a = id => {
   return callbacks[id];
 };
 const remove$9 = id => {
@@ -749,7 +749,7 @@ const warn$1 = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$9(id);
+  const fn = get$a(id);
   if (!fn) {
     console.log(response);
     warn$1(`callback ${id} may already be disposed`);
@@ -1154,7 +1154,7 @@ const rpcs = Object.create(null);
 const set$i = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get$8 = id => {
+const get$9 = id => {
   return rpcs[id];
 };
 const remove$8 = id => {
@@ -1165,18 +1165,18 @@ const remove$8 = id => {
 const create$a = rpcId => {
   return {
     async dispose() {
-      const rpc = get$8(rpcId);
+      const rpc = get$9(rpcId);
       await rpc.dispose();
     },
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get$8(rpcId);
+      const rpc = get$9(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get$8(rpcId);
+      const rpc = get$9(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1515,7 +1515,7 @@ const createLazyRpc = rpcId => {
     const rpc = activeRpc;
     activeRpc = undefined;
     rpcPromise = undefined;
-    if (rpc && get$8(rpcId) === rpc) {
+    if (rpc && get$9(rpcId) === rpc) {
       remove$8(rpcId);
     }
     if (notify) {
@@ -1982,12 +1982,12 @@ const loadContent$3 = async (state, parentUid) => {
 
 const editorStates = create$9();
 const {
-  dispose: dispose$1,
+  dispose: dispose$2,
   getCommandIds,
   registerCommands,
   wrapGetter
 } = editorStates;
-const get$7 = id => {
+const get$8 = id => {
   return editorStates.get(id);
 };
 const getKeys$2 = () => {
@@ -2094,6 +2094,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     validLines: [],
     visibleLineIndices: [],
     visualDecorations: [],
+    widgetRevision: 0,
     widgets: [],
     width,
     x,
@@ -2125,12 +2126,12 @@ const map$1 = Object.create(null);
 const set$8 = (id, widget) => {
   map$1[id] = widget;
 };
-const get$6 = id => {
+const get$7 = id => {
   return map$1[id];
 };
 
 const getModule = id => {
-  return get$6(id);
+  return get$7(id);
 };
 
 const applyWidgetChange = async (editor, widget, changes) => {
@@ -2610,7 +2611,7 @@ const has = languageId => {
 const set$6 = (languageId, tokenizer) => {
   state$9.tokenizers[languageId] = tokenizer;
 };
-const get$5 = languageId => {
+const get$6 = languageId => {
   return state$9.tokenizers[languageId];
 };
 const setTokenizePath = (languageId, tokenizePath) => {
@@ -2634,7 +2635,7 @@ const tokenMaps = Object.create(null);
 const set$5 = (languageId, tokenMap) => {
   tokenMaps[languageId] = tokenMap;
 };
-const get$4 = languageId => {
+const get$5 = languageId => {
   return tokenMaps[languageId] || {};
 };
 
@@ -2672,7 +2673,7 @@ const loadTokenizer = async (languageId, tokenizePath) => {
 };
 const getTokenizer = languageId => {
   if (has(languageId)) {
-    return get$5(languageId);
+    return get$6(languageId);
   }
   if (isPending(languageId)) {
     return TokenizePlainText;
@@ -2684,7 +2685,7 @@ const tokenizers = Object.create(null);
 const set$4 = (id, value) => {
   tokenizers[id] = value;
 };
-const get$3 = id => {
+const get$4 = id => {
   return tokenizers[id] || TokenizePlainText;
 };
 
@@ -2766,7 +2767,7 @@ const getTokensViewport = (editor, startLineIndex, endLineIndex) => {
     lines,
     tokenizerId
   } = editor;
-  const tokenizer = get$3(tokenizerId);
+  const tokenizer = get$4(tokenizerId);
   const {
     hasArrayReturn,
     initialLineState,
@@ -3337,7 +3338,7 @@ const getLineInfosViewport = (editor, tokens, embeddedResults, minLineY, maxLine
     languageId,
     lines
   } = editor;
-  const tokenMap = get$4(languageId);
+  const tokenMap = get$5(languageId);
   let offset = minLineOffset;
   const tabSize = 2;
   for (let i = minLineY; i < maxLineY; i++) {
@@ -3715,7 +3716,7 @@ const notifyListeners = async (listenerType, method, ...params) => {
   // Notify all listeners in parallel
   const notifications = rpcIds.map(async rpcId => {
     try {
-      const rpc = get$8(rpcId);
+      const rpc = get$9(rpcId);
       if (rpc) {
         await rpc.invoke(method, ...params);
       }
@@ -4528,7 +4529,7 @@ const measureCharacterWidth = async (fontWeight, fontSize, fontFamily, letterSpa
   return await measureTextWidth('a', fontWeight, fontSize, fontFamily, letterSpacing, false, 0);
 };
 
-const get$2 = async key => {
+const get$3 = async key => {
   const value = await getPreference(key);
   return value;
 };
@@ -4649,6 +4650,7 @@ const createEditor = async ({
     useFunctionalRendering,
     validLines: [],
     visibleLineIndices: [],
+    widgetRevision: 0,
     widgets: [],
     width,
     x,
@@ -4691,7 +4693,7 @@ const createEditor = async ({
   // 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);
-  const completionsOnTypeRaw = await get$2('editor.completionsOnType');
+  const completionsOnTypeRaw = await get$3('editor.completionsOnType');
   const completionsOnType = Boolean(completionsOnTypeRaw);
   set$9(id, emptyEditor, {
     ...newEditor4,
@@ -4721,7 +4723,7 @@ const createStandaloneEditor = async ({
   y
 }) => {
   createEditor2(id, uri, x, y, width, height, platform, assetDir);
-  const createdEditor = get$7(id).newState;
+  const createdEditor = get$8(id).newState;
   await loadTokenizer(languageId, tokenizePath);
   const tokenizerId = createdEditor.tokenizerId + 1;
   set$4(tokenizerId, getTokenizer(languageId));
@@ -4802,7 +4804,7 @@ const RenderWidgets = 13;
 const RenderAdditionalFocusContext = 14;
 
 const isEqual = (oldState, newState) => {
-  return oldState.widgets === newState.widgets;
+  return oldState.widgets === newState.widgets && oldState.widgetRevision === newState.widgetRevision;
 };
 
 const modules = [isEqual$1, isEqual$2, isEqual$2, isEqual$4, isEqual$3, isEqual];
@@ -4823,37 +4825,45 @@ const diff2 = uid => {
   const {
     newState,
     oldState
-  } = get$7(uid);
+  } = get$8(uid);
   const result = diff(oldState, newState);
   return result;
 };
 
 const addWidget$1 = widget => {
-  const module = get$6(widget.id);
+  const module = get$7(widget.id);
   if (!module) {
     throw new Error('unsupported widget');
   }
   return module.add(widget);
 };
 const renderWidget = widget => {
-  const module = get$6(widget.id);
+  const module = get$7(widget.id);
   if (!module) {
     throw new Error('unsupported widget');
   }
   return module.render(widget);
 };
-const removeWidget$1 = widget => {
-  const module = get$6(widget.id);
-  if (!module) {
-    throw new Error('unsupported widget');
-  }
-  return module.remove(widget);
+
+const revisions = new Map();
+const next = editorUid => {
+  const revision = (revisions.get(editorUid) || 0) + 1;
+  revisions.set(editorUid, revision);
+  return revision;
+};
+const get$2 = editorUid => {
+  return revisions.get(editorUid) || 0;
+};
+const record = (editorUid, revision) => {
+  revisions.set(editorUid, Math.max(get$2(editorUid), revision));
+};
+const dispose$1 = editorUid => {
+  revisions.delete(editorUid);
 };
 
 const renderWidgets$1 = (oldState, newState) => {
   const addedWidgets = [];
   const changedWidgets = [];
-  const removedWidgets = [];
   const oldWidgets = oldState.widgets || [];
   const newWidgets = newState.widgets || [];
   const oldWidgetMap = Object.create(null);
@@ -4867,8 +4877,6 @@ const renderWidgets$1 = (oldState, newState) => {
   for (const oldWidget of oldWidgets) {
     if (Object.hasOwn(newWidgetMap, oldWidget.id)) {
       changedWidgets.push(newWidgetMap[oldWidget.id]);
-    } else {
-      removedWidgets.push(oldWidget);
     }
   }
   for (const newWidget of newWidgets) {
@@ -4890,19 +4898,16 @@ const renderWidgets$1 = (oldState, newState) => {
       changeCommands.push(...childCommands);
     }
   }
-  const removeCommands = [];
-  for (const removedWidget of removedWidgets) {
-    const childCommands = removeWidget$1(removedWidget);
-    if (childCommands.length > 0) {
-      removeCommands.push(...childCommands);
-    }
-  }
-  const allCommands = [...addCommands, ...changeCommands, ...removeCommands];
-  return allCommands.filter(item => item[0] !== 'Viewlet.setFocusContext');
+  const hasDeclaredRevision = typeof newState.widgetRevision === 'number' && newState.widgetRevision > (oldState.widgetRevision || 0);
+  const declaredRevision = hasDeclaredRevision ? newState.widgetRevision : next(newState.uid);
+  record(newState.uid, declaredRevision);
+  const widgetUids = newWidgets.map(widget => widget.newState.uid);
+  const allCommands = [...addCommands, ...changeCommands, ['Viewlet.setWidgets', newState.uid, declaredRevision, widgetUids]];
+  return allCommands.filter(item => item[0] !== 'Viewlet.setFocusContext' && item[0] !== 'Viewlet.appendToBody');
 };
 
 const disposeEditor = async editorUid => {
-  const editor = get$7(editorUid)?.newState;
+  const editor = get$8(editorUid)?.newState;
   if (!editor) {
     return [];
   }
@@ -4912,9 +4917,11 @@ const disposeEditor = async editorUid => {
     }
   }
   const commands = renderWidgets$1(editor, {
+    ...editor,
     widgets: []
   });
   dispose$1(editorUid);
+  dispose$2(editorUid);
   return commands;
 };
 
@@ -5073,7 +5080,7 @@ const getOpenEditor = (currentEditor, uri) => {
     return currentEditor;
   }
   for (const key of getKeys$2()) {
-    const editor = get$7(Number(key))?.newState;
+    const editor = get$8(Number(key))?.newState;
     if (editor && !editor.initial && editor.uri === uri) {
       return editor;
     }
@@ -5509,16 +5516,18 @@ const handleBlur$1 = async editor => {
   if (!editor.focused) {
     return editor;
   }
+  const widgetRevision = next(editor.uid);
   const newEditor = {
     ...editor,
     additionalFocus: 0,
     focused: false,
+    widgetRevision,
     widgets: closeWidgetsMaybe(editor.widgets || [])
   };
   if (!editor.modified) {
     return newEditor;
   }
-  const autoSave = await get$2('files.autoSave');
+  const autoSave = await get$3('files.autoSave');
   if (autoSave === 'off') {
     return newEditor;
   }
@@ -5650,6 +5659,7 @@ const closeCodeGenerator = editor => {
   const {
     widgets
   } = editor;
+  const widgetRevision = next(editor.uid);
   const index = widgets.findIndex(isMatchingWidget$2);
   if (index === -1) {
     return editor;
@@ -5658,6 +5668,7 @@ const closeCodeGenerator = editor => {
   return {
     ...editor,
     focused: true,
+    widgetRevision,
     widgets: newWidgets
   };
 };
@@ -5666,6 +5677,7 @@ const closeCompletion = editor => {
   const {
     widgets
   } = editor;
+  const widgetRevision = next(editor.uid);
   if (widgets.every(widget => widget.id !== Completion)) {
     return editor;
   }
@@ -5673,6 +5685,7 @@ const closeCompletion = editor => {
     ...editor,
     additionalFocus: 0,
     focused: true,
+    widgetRevision,
     widgets: removeEditorWidget(widgets, Completion)
   };
 };
@@ -5684,6 +5697,7 @@ const closeFind = editor => {
   const {
     widgets
   } = editor;
+  const widgetRevision = next(editor.uid);
   const index = widgets.findIndex(isMatchingWidget$1);
   if (index === -1) {
     return editor;
@@ -5694,6 +5708,7 @@ const closeFind = editor => {
     additionalFocus: 0,
     focus: FocusEditorText$1,
     focused: true,
+    widgetRevision,
     widgets: newWidgets
   };
 };
@@ -5727,17 +5742,21 @@ const closeRename = async editor => {
     uid,
     widgets
   } = editor;
+  const widgetRevision = next(uid);
   const renameWidgetIndex = widgets.findIndex(isRenameWidget);
   if (renameWidgetIndex === -1) {
     return editor;
   }
   const renameWidget = widgets[renameWidgetIndex];
   await invoke$5('Rename.close', renameWidget.newState.uid);
-  const latest = get$7(uid);
+  const latest = get$8(uid);
   const {
     newState
   } = latest;
-  return newState;
+  return {
+    ...newState,
+    widgetRevision: Math.max(newState.widgetRevision || 0, widgetRevision)
+  };
 };
 
 const isMatchingWidget = widget => {
@@ -5747,6 +5766,7 @@ const closeSourceAction = editor => {
   const {
     widgets
   } = editor;
+  const widgetRevision = next(editor.uid);
   const index = widgets.findIndex(isMatchingWidget);
   if (index === -1) {
     return editor;
@@ -5754,6 +5774,7 @@ const closeSourceAction = editor => {
   const newWidgets = removeEditorWidget(widgets, SourceAction$1);
   return {
     ...editor,
+    widgetRevision,
     widgets: newWidgets
   };
 };
@@ -5774,6 +5795,7 @@ const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGe
   if (hasWidget(widgets, widgetId)) {
     return editor;
   }
+  const widgetRevision = next(editor.uid);
   const widget = factory();
   // @ts-ignore
   widget.newState.editorUid = editor.uid;
@@ -5781,6 +5803,9 @@ const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGe
   if (!newState) {
     return editor;
   }
+  if (get$2(editor.uid) !== widgetRevision) {
+    return get$8(editor.uid)?.newState || editor;
+  }
   // @ts-ignore
   newState.editorUid = editor.uid;
   const latestWidget = {
@@ -5794,6 +5819,7 @@ const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGe
     additionalFocus: fullFocus ? 0 : focusKey,
     focus: fullFocus ? focusKey : FocusEditorText$1,
     focused: newFocus,
+    widgetRevision,
     widgets: newWidgets
   };
   return newEditor;
@@ -5834,6 +5860,7 @@ const closeColorPicker = editor => {
   const {
     widgets
   } = editor;
+  const widgetRevision = next(editor.uid);
   if (widgets.every(widget => widget.id !== ColorPicker$1)) {
     return editor;
   }
@@ -5842,6 +5869,7 @@ const closeColorPicker = editor => {
     additionalFocus: 0,
     focus: FocusEditorText$1,
     focused: true,
+    widgetRevision,
     widgets: removeEditorWidget(widgets, ColorPicker$1)
   };
 };
@@ -7190,11 +7218,13 @@ const Alt = 2;
 
 const handleSingleClickDefault = (editor, position) => {
   const widgets = closeWidgetsMaybe(editor.widgets);
+  const widgetRevision = next(editor.uid);
   return {
     ...editor,
     focused: true,
     selectionAnchorPosition: position,
     selections: new Uint32Array([position.rowIndex, position.columnIndex, position.rowIndex, position.columnIndex]),
+    widgetRevision,
     widgets
   };
 };
@@ -7695,7 +7725,7 @@ const getHoverPositionXy = (editor, rowIndex, wordStart, documentationHeight) =>
 };
 const getEditorHoverInfo = async (editorUid, position) => {
   number(editorUid);
-  const instance = get$7(editorUid);
+  const instance = get$8(editorUid);
   const editor = instance.newState;
   const {
     selections
@@ -7765,13 +7795,13 @@ const showHover2 = async (editor, position) => {
 };
 
 const showHover$1 = async (editor, position, token) => {
-  const instance = get$7(editor.uid);
+  const instance = get$8(editor.uid);
   if (!instance) {
     return;
   }
   const latestEditor = instance.newState;
   const newEditor = await showHover2(latestEditor, position);
-  const latestInstance = get$7(editor.uid);
+  const latestInstance = get$8(editor.uid);
   if (latestEditor === newEditor || !latestInstance || latestInstance.newState !== latestEditor || get$1().token !== token) {
     return;
   }
@@ -8055,7 +8085,7 @@ const getNewEditor = (editor, position) => {
   return editor;
 };
 const continueScrollingAndMovingSelection = async editorUid => {
-  const editorState = get$7(editorUid);
+  const editorState = get$8(editorUid);
   const editor = editorState?.newState;
   if (!editor || !editor.hasListener || !editor.isSelecting) {
     return;
@@ -8618,7 +8648,7 @@ const newStateGenerator$3 = async (state, parentUid) => {
   } = state;
   const {
     newState
-  } = get$7(parentUid);
+  } = get$8(parentUid);
   const {
     languageId
   } = newState;
@@ -8651,7 +8681,7 @@ const isFunctional = widgetId => {
   }
 };
 const addWidget = (widget, id, render) => {
-  const commands = render(widget);
+  const commands = render(widget).filter(command => command[0] !== 'Viewlet.appendToBody');
   // TODO how to generate a unique integer id
   // that doesn't collide with ids created in renderer worker?
   // @ts-ignore
@@ -8661,11 +8691,6 @@ const addWidget = (widget, id, render) => {
   const allCommands = [];
   allCommands.push(['Viewlet.createFunctionalRoot', id, uid, isFunctional(widget.id)]);
   allCommands.push(...commands);
-  if (isFunctional(widget.id)) {
-    allCommands.push(['Viewlet.appendToBody', uid]);
-  } else {
-    allCommands.push(['Viewlet.send', uid, 'appendWidget']);
-  }
   const focusCommandIndex = allCommands.findIndex(command => {
     return command[2] === 'focus' || command[0] === 'Viewlet.focusSelector';
   });
@@ -8691,18 +8716,18 @@ const launchFindWidgetWorker = async () => {
 const rpcId = 9002;
 const launch = async () => {
   // TODO race condition
-  if (get$8(rpcId)) {
+  if (get$9(rpcId)) {
     return;
   }
   const rpc = await launchFindWidgetWorker();
   set$i(rpcId, rpc);
 };
 const invoke$3 = async (method, ...params) => {
-  const rpc = get$8(rpcId);
+  const rpc = get$9(rpcId);
   return await rpc.invoke(method, ...params);
 };
 const dispose = async () => {
-  const rpc = get$8(rpcId);
+  const rpc = get$9(rpcId);
   remove$8(rpcId);
   if (rpc) {
     await rpc.dispose();
@@ -8800,7 +8825,7 @@ const updateWidget = (editor, widgetId, newState) => {
 
 const getEditorByWidgetUid = (widgetUid, widgetId) => {
   for (const key of getKeys$2()) {
-    const editor = get$7(Number(key)).newState;
+    const editor = get$8(Number(key)).newState;
     const widgets = editor.widgets || [];
     for (const widget of widgets) {
       if (widget.id === widgetId && widget.newState.uid === widgetUid) {
@@ -8814,7 +8839,7 @@ const getEditor$1 = (editorOrUid, widgetId) => {
   if (editorOrUid && editorOrUid.widgets) {
     return editorOrUid;
   }
-  const instance = get$7(editorOrUid);
+  const instance = get$8(editorOrUid);
   if (instance && instance.newState && instance.newState.widgets) {
     return instance.newState;
   }
@@ -8832,6 +8857,8 @@ const createFn = (key, name, widgetId) => {
     if (!editor) {
       return editorOrUid;
     }
+    const shouldClose = isClose(args);
+    const widgetRevision = shouldClose ? next(editor.uid) : editor.widgetRevision;
     const childIndex = editor.widgets.findIndex(isWidget);
     if (childIndex === -1) {
       return editor;
@@ -8844,13 +8871,19 @@ const createFn = (key, name, widgetId) => {
     } = state;
     const invoke = getWidgetInvoke(widgetId);
     await invoke(`${name}.${key}`, uid, ...args);
+    const latestAfterInvoke = get$8(editor.uid).newState;
+    const latestChildIndex = latestAfterInvoke.widgets.findIndex(isWidget);
+    if (latestChildIndex === -1) {
+      return latestAfterInvoke;
+    }
     const diff = await invoke(`${name}.diff2`, uid);
     const commands = await invoke(`${name}.render2`, uid, diff);
-    const latest = get$7(editor.uid).newState;
-    if (isClose(args)) {
+    const latest = get$8(editor.uid).newState;
+    if (shouldClose) {
       const newEditor = {
         ...latest,
         focused: true,
+        widgetRevision,
         widgets: removeEditorWidget(latest.widgets, widgetId)
       };
       set$9(editor.uid, latest, newEditor);
@@ -8881,7 +8914,6 @@ const renderFull$4 = (oldState, newState) => {
   return commands;
 };
 
-const AppendToBody = 'Viewlet.appendToBody';
 const Focus = 'focus';
 const FocusSelector = 'Viewlet.focusSelector';
 const RegisterEventListeners = 'Viewlet.registerEventListeners';
@@ -8894,7 +8926,7 @@ const SetCss = 'Viewlet.setCss';
 const SetDom2 = 'Viewlet.setDom2';
 const SetUid = 'Viewlet.setUid';
 
-const commandsToForward$5 = [SetDom2, SetCss, AppendToBody, SetBounds2, RegisterEventListeners, SetSelectionByName, SetValueByName, SetFocusContext, SetUid, 'Viewlet.focusSelector'];
+const commandsToForward$5 = [SetDom2, SetCss, SetBounds2, RegisterEventListeners, SetSelectionByName, SetValueByName, SetFocusContext, SetUid, 'Viewlet.focusSelector'];
 const render$c = widget => {
   const commands = renderFull$4(widget.oldState, widget.newState);
   const wrappedCommands = [];
@@ -8914,7 +8946,7 @@ const add$8 = widget => {
   return addWidget(widget, 'FindWidget', render$c);
 };
 const remove$7 = widget => {
-  return [['Viewlet.dispose', widget.newState.uid]];
+  return [];
 };
 const focusFindInput = editor => {
   const widget = editor.widgets.find(widget => widget.id === Find);
@@ -9022,7 +9054,7 @@ const create$2 = () => {
 };
 
 const getEditor = editorUid => {
-  const instance = get$7(editorUid);
+  const instance = get$8(editorUid);
   if (!instance) {
     throw new Error(`editor ${editorUid} not found`);
   }
@@ -9130,7 +9162,7 @@ const newStateGenerator$1 = async (state, parentUid) => {
   } = state;
   const {
     newState
-  } = get$7(parentUid);
+  } = get$8(parentUid);
   const {
     languageId
   } = newState;
@@ -9848,7 +9880,7 @@ const getSignatureHelp = async (editor, offset) => {
 
 const getSignatureHelpInfo = async editorUid => {
   number(editorUid);
-  const instance = get$7(editorUid);
+  const instance = get$8(editorUid);
   const editor = instance.newState;
   const {
     selections
@@ -9960,7 +9992,7 @@ const newStateGenerator = async (state, parentUid) => {
   } = state;
   const {
     newState
-  } = get$7(parentUid);
+  } = get$8(parentUid);
   const {
     languageId
   } = newState;
@@ -10782,7 +10814,7 @@ const renderFull$3 = (oldState, newState) => {
   return commands;
 };
 
-const commandsToForward$4 = [SetDom2, SetCss, AppendToBody, SetBounds2, RegisterEventListeners, SetSelectionByName, SetValueByName, SetFocusContext, SetUid, 'Viewlet.focusSelector'];
+const commandsToForward$4 = [SetDom2, SetCss, SetBounds2, RegisterEventListeners, SetSelectionByName, SetValueByName, SetFocusContext, SetUid, 'Viewlet.focusSelector'];
 const render$b = widget => {
   const commands = renderFull$3(widget.oldState, widget.newState);
   const wrappedCommands = [];
@@ -10802,7 +10834,7 @@ const add$7 = widget => {
   return addWidget(widget, 'EditorCompletion', render$b);
 };
 const remove$6 = widget => {
-  return [['Viewlet.dispose', widget.newState.uid]];
+  return [];
 };
 const {
   close: close$3,
@@ -11064,7 +11096,7 @@ const renderHover = (oldState, newState) => {
   return commands;
 };
 
-const commandsToForward$3 = [SetDom2, SetCss, AppendToBody, SetBounds2, RegisterEventListeners, SetSelectionByName, SetValueByName, SetFocusContext, SetUid, 'Viewlet.focusSelector'];
+const commandsToForward$3 = [SetDom2, SetCss, SetBounds2, RegisterEventListeners, SetSelectionByName, SetValueByName, SetFocusContext, SetUid, 'Viewlet.focusSelector'];
 const render$9 = widget => {
   const commands = renderFull$3(widget.oldState, widget.newState);
   const wrappedCommands = [];
@@ -11084,7 +11116,7 @@ const add$6 = widget => {
   return addWidget(widget, 'EditorRename', render$9);
 };
 const remove$5 = widget => {
-  return [['Viewlet.dispose', widget.newState.uid]];
+  return [];
 };
 const {
   accept,
@@ -11121,11 +11153,10 @@ const focusNext$1 = state => {
 };
 
 const removeWidget = widget => {
-  // @ts-ignore
-  return [['Viewlet.dispose', widget.newState.uid]];
+  return [];
 };
 
-const commandsToForward$2 = [SetDom2, SetCss, AppendToBody, SetBounds2, RegisterEventListeners, SetSelectionByName, SetValueByName, SetFocusContext, SetUid, 'Viewlet.focusSelector'];
+const commandsToForward$2 = [SetDom2, SetCss, SetBounds2, RegisterEventListeners, SetSelectionByName, SetValueByName, SetFocusContext, SetUid, 'Viewlet.focusSelector'];
 const render$8 = widget => {
   const commands = renderFull$3(widget.oldState, widget.newState);
   const wrappedCommands = [];
@@ -11220,7 +11251,7 @@ const getEditorSourceActions = async editorId => {
   }
   const {
     newState
-  } = get$7(editorId);
+  } = get$8(editorId);
   const offset = getOffsetAtCursor$1(newState);
   return execute({
     args: [offset],
@@ -11333,6 +11364,7 @@ const setSelections2 = async (editorUid, selections) => {
 };
 const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocus$1) => {
   const editor = getEditor(editorUid);
+  const widgetRevision = next(editorUid);
   const invoke = getWidgetInvoke(widgetId);
   const {
     widgets
@@ -11347,6 +11379,7 @@ const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocu
     ...editor,
     decorations: widgetId === Rename$1 ? editor.decorations.slice(0, -4) : editor.decorations,
     focused: true,
+    widgetRevision,
     widgets: newWidgets
   };
   const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
@@ -11869,7 +11902,7 @@ const getProblems = async () => {
   const keys = getKeys$2();
   const diagnostics = keys.flatMap(key => {
     const numericKey = Number(key);
-    const editor = get$7(numericKey);
+    const editor = get$8(numericKey);
     if (!editor?.newState) {
       return [];
     }
@@ -12013,49 +12046,49 @@ const kAutoClosingBrackets = 'editor.autoclosingBrackets';
 const kFontWeight = 'editor.fontWeight';
 const kHover = 'editor.hover';
 const isAutoClosingBracketsEnabled = async () => {
-  return Boolean(await get$2(kAutoClosingBrackets));
+  return Boolean(await get$3(kAutoClosingBrackets));
 };
 const isAutoClosingQuotesEnabled = async () => {
-  return Boolean(await get$2(kAutoClosingQuotes));
+  return Boolean(await get$3(kAutoClosingQuotes));
 };
 const isQuickSuggestionsEnabled = async () => {
-  return Boolean(await get$2(kQuickSuggestions));
+  return Boolean(await get$3(kQuickSuggestions));
 };
 const isAutoClosingTagsEnabled = async () => {
   return true;
 };
 const getRowHeight = async () => {
-  return (await get$2(kLineHeight)) || 20;
+  return (await get$3(kLineHeight)) || 20;
 };
 const getFontSize = async () => {
-  return (await get$2(kFontSize)) || 15; // TODO find out if it is possible to use all numeric values for settings for efficiency, maybe settings could be an array
+  return (await get$3(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 getHoverEnabled = async () => {
-  return (await get$2(kHover)) ?? true;
+  return (await get$3(kHover)) ?? true;
 };
 const getFontFamily = async () => {
-  return (await get$2(kFontFamily)) || 'Fira Code';
+  return (await get$3(kFontFamily)) || 'Fira Code';
 };
 const getLetterSpacing = async () => {
   // if (!false) {
   //   return 0
   // }
-  return (await get$2(kLetterSpacing)) ?? 0.5;
+  return (await get$3(kLetterSpacing)) ?? 0.5;
 };
 const getTabSize = async () => {
-  return (await get$2(kTabSize)) || 2;
+  return (await get$3(kTabSize)) || 2;
 };
 const getLineNumbers = async () => {
-  return (await get$2(kLineNumbers)) ?? false;
+  return (await get$3(kLineNumbers)) ?? false;
 };
 const getCompletionTriggerCharacters = async () => {
   return ['.', '/'];
 };
 const diagnosticsEnabled = async () => {
-  return (await get$2(kDiagnostics)) ?? false;
+  return (await get$3(kDiagnostics)) ?? false;
 };
 const getFontWeight = async () => {
-  return (await get$2(kFontWeight)) ?? 400;
+  return (await get$3(kFontWeight)) ?? 400;
 };
 
 const getEditorPreferences = async () => {
@@ -12088,7 +12121,7 @@ const handleSettingsChanged = async state => {
     letterSpacing,
     rowHeight
   } = editorPreferences;
-  const [charWidth, completionsOnTypeRaw] = await Promise.all([measureCharacterWidth(fontWeight, fontSize, fontFamily, letterSpacing), get$2('editor.completionsOnType')]);
+  const [charWidth, completionsOnTypeRaw] = await Promise.all([measureCharacterWidth(fontWeight, fontSize, fontFamily, letterSpacing), get$3('editor.completionsOnType')]);
   const isMonospaceFont = fontFamily === 'Fira Code' || fontFamily === "'Fira Code'";
   const editorWithUpdatedSettings = {
     ...state,
@@ -12168,7 +12201,7 @@ const restoreWidgetState = async (keys, savedStates) => {
   const newEditors = [];
   for (const key of keys) {
     const editorUid = parseInt(key);
-    const editor = get$7(editorUid);
+    const editor = get$8(editorUid);
     if (!editor?.newState || !Array.isArray(editor.newState.widgets)) {
       continue;
     }
@@ -12221,7 +12254,7 @@ const saveSingleWidgetState = async (savedStates, key, widget) => {
 const saveWidgetState = async keys => {
   const savedStates = Object.create(null);
   for (const key of keys) {
-    const editor = get$7(parseInt(key));
+    const editor = get$8(parseInt(key));
     if (!editor?.newState || !Array.isArray(editor.newState.widgets)) {
       continue;
     }
@@ -12382,7 +12415,7 @@ const loadContent = async (state, savedState) => {
   };
   let existingEditor;
   for (const key of getKeys$2()) {
-    const editor = get$7(Number(key))?.newState;
+    const editor = get$8(Number(key))?.newState;
     if (editor && editor.id !== id && !editor.initial && editor.uri === uri) {
       existingEditor = editor;
       break;
@@ -12434,7 +12467,7 @@ const loadContent = async (state, savedState) => {
   // 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);
-  const completionsOnTypeRaw = await get$2('editor.completionsOnType');
+  const completionsOnTypeRaw = await get$3('editor.completionsOnType');
   const completionsOnType = Boolean(completionsOnTypeRaw);
   const newEditor5 = {
     ...newEditor4,
@@ -12573,6 +12606,9 @@ const renderCss$1 = (oldState, newState) => {
 };
 
 const renderFocus$2 = (oldState, newState) => {
+  if (!newState.focused) {
+    return [];
+  }
   const selector = '.EditorInput textarea';
   return [FocusSelector$1, newState.uid, selector];
 };
@@ -13255,7 +13291,7 @@ const render2 = (uid, diffResult) => {
   const {
     newState,
     oldState
-  } = get$7(uid);
+  } = get$8(uid);
   set$9(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
@@ -13339,12 +13375,12 @@ const renderGutterInfo = {
 };
 const renderWidgets = {
   apply: renderWidgets$1,
-  isEqual: (oldState, newState) => oldState.widgets === newState.widgets,
+  isEqual: (oldState, newState) => oldState.widgets === newState.widgets && oldState.widgetRevision === newState.widgetRevision,
   multiple: true
 };
 const render$7 = [renderLines, renderSelections, renderCss, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets, renderFocusContext, renderAdditionalFocusContext];
 const renderEditor = async id => {
-  const instance = get$7(id);
+  const instance = get$8(id);
   if (!instance) {
     return [];
   }
@@ -13481,7 +13517,7 @@ const unregisterListener = (listenerType, rpcId) => {
 };
 
 const invoke = async (method, ...params) => {
-  const worker = get$8(DebugWorker);
+  const worker = get$9(DebugWorker);
   return worker.invoke(method, ...params);
 };
 
@@ -13497,7 +13533,7 @@ const getKey = () => {
 const updateDebugInfo = async debugId => {
   const newInfo = await getDebugHighlight(debugId);
   const key = getKey();
-  const instance = get$7(key);
+  const instance = get$8(key);
   if (!instance) {
     return;
   }
@@ -13653,7 +13689,7 @@ const updateDiagnostics = async editor => {
   }
   try {
     const diagnostics = await getDiagnostics(editor);
-    const latest = get$7(editor.id);
+    const latest = get$8(editor.id);
     if (!latest) {
       return editor;
     }
@@ -13680,7 +13716,7 @@ const queues = {};
 // TODO only store editor state in editor worker, not in renderer worker also
 
 const wrapCommand = fn => async (uid, ...args) => {
-  const initialInstance = get$7(uid);
+  const initialInstance = get$8(uid);
   const queueKey = initialInstance?.newState.uri || uid;
   const previous = queues[queueKey];
   const {
@@ -13692,7 +13728,7 @@ const wrapCommand = fn => async (uid, ...args) => {
     await previous;
   }
   try {
-    const oldInstance = get$7(uid);
+    const oldInstance = get$8(uid);
     const state = oldInstance.newState;
     const newEditor = await fn(state, ...args);
     if (state === newEditor) {
@@ -13703,7 +13739,7 @@ const wrapCommand = fn => async (uid, ...args) => {
     let finalEditor = newEditorWithDerivedState;
     if (editorDiagnosticEffect.isActive(state, newEditorWithDerivedState)) {
       finalEditor = await editorDiagnosticEffect.apply(newEditorWithDerivedState);
-      if (!get$7(uid)) {
+      if (!get$8(uid)) {
         return finalEditor;
       }
       set$9(uid, state, finalEditor);
@@ -13719,7 +13755,7 @@ const wrapCommand = fn => async (uid, ...args) => {
     if (!initial && uri === finalEditor.uri && (lines !== finalEditor.lines || modified !== finalEditor.modified || redoStack !== finalEditor.redoStack || undoStack !== finalEditor.undoStack)) {
       for (const key of getKeys$2()) {
         const otherUid = Number(key);
-        const instance = get$7(otherUid);
+        const instance = get$8(otherUid);
         const editor = instance?.newState;
         if (otherUid === uid || !instance || !editor || editor.initial || editor.uri !== finalEditor.uri) {
           continue;
@@ -14207,7 +14243,7 @@ const renderFull$1 = (oldState, newState) => {
   return commands;
 };
 
-const commandsToForward$1 = [SetDom2, SetCss, AppendToBody, FocusSelector, SetBounds2, RegisterEventListeners, SetUid];
+const commandsToForward$1 = [SetDom2, SetCss, FocusSelector, SetBounds2, RegisterEventListeners, SetUid];
 const render$4 = widget => {
   const commands = renderFull$1(widget.oldState, widget.newState);
   const wrappedCommands = [];
@@ -14366,7 +14402,7 @@ const EditorCompletionDetailWidget = {
   render: render$2
 };
 
-const commandsToForward = [SetDom2, SetCss, AppendToBody, SetBounds2, RegisterEventListeners, SetSelectionByName, SetValueByName, SetFocusContext, SetUid, 'Viewlet.focusSelector'];
+const commandsToForward = [SetDom2, SetCss, SetBounds2, RegisterEventListeners, SetSelectionByName, SetValueByName, SetFocusContext, SetUid, 'Viewlet.focusSelector'];
 const render$1 = widget => {
   const {
     newState,
@@ -14390,7 +14426,7 @@ const add$1 = widget => {
   return addWidget(widget, 'EditorCompletion', render$1);
 };
 const remove = widget => {
-  return [['Viewlet.dispose', widget.newState.uid]];
+  return [];
 };
 const {
   close

package/package.json

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