@lvce-editor/editor-worker 19.70.5 → 19.70.7

package/dist/editorWorkerMain.js

@@ -1187,7 +1187,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$i = (id, rpc) => {
+const set$j = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$9 = id => {
@@ -1220,7 +1220,7 @@ const create$c = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$i(rpcId, mockRpc);
+      set$j(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$8(rpcId);
@@ -1229,7 +1229,7 @@ const create$c = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$i(rpcId, rpc);
+      set$j(rpcId, rpc);
     }
   };
 };
@@ -1328,23 +1328,23 @@ const FocusEditorText$1 = 12;
 
 const {
   invoke: invoke$j,
-  set: set$h
+  set: set$i
 } = create$c(DialogWorker);
 
 const {
   invoke: invoke$i,
-  set: set$g
+  set: set$h
 } = create$c(DragAndDropWorker);
 
 const {
   invoke: invoke$h,
-  set: set$f
+  set: set$g
 } = create$c(ErrorWorker);
 
 const {
   invoke: invoke$g,
   invokeAndTransfer: invokeAndTransfer$2,
-  set: set$e
+  set: set$f
 } = create$c(ExtensionManagementWorker);
 const getLanguages$1 = (platform, assetDir) => {
   return invoke$g('Extensions.getLanguages', platform, assetDir);
@@ -1363,7 +1363,7 @@ const createLazyRpc = rpcId => {
       throw new Error('Lazy RPC launch was superseded');
     }
     activeRpc = rpc;
-    set$i(rpcId, rpc);
+    set$j(rpcId, rpc);
     return rpc;
   };
   const ensureRpc = async () => {
@@ -1425,7 +1425,7 @@ const createLazyRpc = rpcId => {
 
 const {
   invoke: invoke$f,
-  set: set$d
+  set: set$e
 } = create$c(OpenerWorker);
 const openUrl = async (url, platform) => {
   return invoke$f('Open.openUrl', url, platform);
@@ -1433,13 +1433,13 @@ const openUrl = async (url, platform) => {
 
 const {
   invoke: invoke$e,
-  set: set$c
+  set: set$d
 } = create$c(TextMeasurementWorker);
 
 const {
   invoke: invoke$d,
   invokeAndTransfer: invokeAndTransfer$1,
-  set: set$b
+  set: set$c
 } = create$c(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
@@ -1494,13 +1494,13 @@ const sendMessagePortToSyntaxHighlightingWorker$1 = async port => {
 
 const {
   invoke: invoke$c,
-  set: set$a
+  set: set$b
 } = create$c(MarkdownWorker);
 
 const SyntaxHighlightingWorker = {
   __proto__: null,
   invoke: invoke$c,
-  set: set$a
+  set: set$b
 };
 
 const toCommandId = key => {
@@ -1811,7 +1811,7 @@ const getKeys$2 = () => {
   const keys = editorStates.getKeys();
   return keys.map(String);
 };
-const set$9 = (id, oldEditor, newEditor) => {
+const set$a = (id, oldEditor, newEditor) => {
   editorStates.set(id, oldEditor, newEditor);
 };
 
@@ -1862,7 +1862,7 @@ const ToggleBlockComment$1 = 'toggleBlockComment';
 const Unknown$2 = 'unknown';
 
 const map$1 = Object.create(null);
-const set$8 = (id, widget) => {
+const set$9 = (id, widget) => {
   map$1[id] = widget;
 };
 const get$7 = id => {
@@ -2506,7 +2506,7 @@ const getEnabled$1 = () => {
 
 const {
   invoke: invoke$b,
-  set: set$7
+  set: set$8
 } = SyntaxHighlightingWorker;
 
 const state$c = {
@@ -2517,7 +2517,7 @@ const state$c = {
 const has = languageId => {
   return Object.hasOwn(state$c.tokenizers, languageId);
 };
-const set$6 = (languageId, tokenizer) => {
+const set$7 = (languageId, tokenizer) => {
   state$c.tokenizers[languageId] = tokenizer;
 };
 const get$6 = languageId => {
@@ -2541,7 +2541,7 @@ const isPending = languageId => {
 };
 
 const tokenMaps = Object.create(null);
-const set$5 = (languageId, tokenMap) => {
+const set$6 = (languageId, tokenMap) => {
   tokenMaps[languageId] = tokenMap;
 };
 const get$5 = languageId => {
@@ -2557,7 +2557,7 @@ const loadTokenizer = async (languageId, tokenizePath) => {
   if (getEnabled$1()) {
     // @ts-ignore
     const tokenMap = await invoke$b('Tokenizer.load', languageId, tokenizePath);
-    set$5(languageId, tokenMap);
+    set$6(languageId, tokenMap);
     return;
   }
   try {
@@ -2573,8 +2573,8 @@ const loadTokenizer = async (languageId, tokenizePath) => {
       console.warn(`tokenizer.TokenMap should be an object in "${tokenizePath}"`);
       return;
     }
-    set$5(languageId, tokenizer.TokenMap);
-    set$6(languageId, tokenizer);
+    set$6(languageId, tokenizer.TokenMap);
+    set$7(languageId, tokenizer);
   } catch (error) {
     // TODO better error handling
     console.error(error);
@@ -2591,7 +2591,7 @@ const getTokenizer = languageId => {
 };
 
 const tokenizers = Object.create(null);
-const set$4 = (id, value) => {
+const set$5 = (id, value) => {
   tokenizers[id] = value;
 };
 const get$4 = id => {
@@ -4390,7 +4390,7 @@ const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionCh
     ...newEditor,
     decorations: linkDecorations
   };
-  set$9(editor.uid, editor, newEditorWithDecorations);
+  set$a(editor.uid, editor, newEditorWithDecorations);
 
   // Notify main-area-worker about modified status change
   if (!editor.modified) {
@@ -5273,7 +5273,7 @@ const updateColorPickerValue = async (editorUid, value) => {
     return;
   }
   const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
-  set$9(editorUid, editor, newEditorWithDerivedState);
+  set$a(editorUid, editor, newEditorWithDerivedState);
 };
 
 const getColorPickerWorkerCommandMap = () => ({
@@ -5484,7 +5484,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir, _langua
     x,
     y
   };
-  set$9(id, editor, editor);
+  set$a(id, editor, editor);
 };
 
 const emptyEditor = {
@@ -5827,10 +5827,10 @@ const createEditor = async ({
     focused: true,
     textInfos
   };
-  set$9(id, emptyEditor, newEditor4);
+  set$a(id, emptyEditor, newEditor4);
   const completionsOnTypeRaw = await get$3('editor.completionsOnType');
   const completionsOnType = Boolean(completionsOnTypeRaw);
-  set$9(id, emptyEditor, {
+  set$a(id, emptyEditor, {
     ...newEditor4,
     completionsOnType
   });
@@ -5861,7 +5861,7 @@ const createStandaloneEditor = async ({
   const createdEditor = get$8(id).newState;
   await loadTokenizer(languageId, tokenizePath);
   const tokenizerId = createdEditor.tokenizerId + 1;
-  set$4(tokenizerId, getTokenizer(languageId));
+  set$5(tokenizerId, getTokenizer(languageId));
   const configuredEditor = {
     ...createdEditor,
     charWidth,
@@ -5906,7 +5906,7 @@ const createStandaloneEditor = async ({
     selectionInfos
   };
   if (!createdEditor.lifecycle?.disposed) {
-    set$9(id, createdEditor, finalEditor);
+    set$a(id, createdEditor, finalEditor);
   }
 };
 
@@ -6019,17 +6019,17 @@ const dispose$4 = uid => {
   pendingSaves.delete(uid);
 };
 
-const dismissals = new Map();
-const clear$2 = editorUid => {
-  const dismissal = dismissals.get(editorUid);
+const dismissals$1 = new Map();
+const clear$3 = editorUid => {
+  const dismissal = dismissals$1.get(editorUid);
   if (dismissal) {
     clearTimeout(dismissal.timeout);
-    dismissals.delete(editorUid);
+    dismissals$1.delete(editorUid);
   }
 };
-const set$3 = (editorUid, dismissal) => {
-  clear$2(editorUid);
-  dismissals.set(editorUid, dismissal);
+const set$4 = (editorUid, dismissal) => {
+  clear$3(editorUid);
+  dismissals$1.set(editorUid, dismissal);
 };
 
 const state$6 = {
@@ -6042,14 +6042,14 @@ const state$6 = {
 const get$2 = () => {
   return state$6;
 };
-const set$2 = (editor, timeout, x, y, token) => {
+const set$3 = (editor, timeout, x, y, token) => {
   state$6.editor = editor;
   state$6.timeout = timeout;
   state$6.token = token;
   state$6.x = x;
   state$6.y = y;
 };
-const clear$1 = editorUid => {
+const clear$2 = editorUid => {
   const {
     editor,
     timeout
@@ -6065,6 +6065,20 @@ const clear$1 = editorUid => {
   state$6.token++;
 };
 
+const dismissals = new Map();
+const clear$1 = editorUid => {
+  const dismissal = dismissals.get(editorUid);
+  if (!dismissal) {
+    return;
+  }
+  clearTimeout(dismissal.timeout);
+  dismissals.delete(editorUid);
+};
+const set$2 = (editorUid, dismissal) => {
+  clear$1(editorUid);
+  dismissals.set(editorUid, dismissal);
+};
+
 const getOffset = (lines, rowIndex, columnIndex) => {
   let offset = columnIndex;
   for (let i = 0; i < rowIndex; i++) {
@@ -6436,7 +6450,7 @@ const commitDiagnostics = async (editor, generation, diagnostics, onAccepted) =>
       return latest.newState;
     }
     const newEditor = mergeDiagnostics(latest.newState, editorWithDiagnostics);
-    set$9(editor.id, latest.oldState, newEditor);
+    set$a(editor.id, latest.oldState, newEditor);
     requestDiagnosticSnapshots.set(editor.id, diagnostics);
     onAccepted?.();
     await invoke$5('Editor.renderPending', newEditor.id);
@@ -6649,8 +6663,9 @@ const disposeEditor = async editorUid => {
   }
   dispose$2(editorUid);
   dispose$4(editorUid);
-  clear$1(editorUid);
   clear$2(editorUid);
+  clear$3(editorUid);
+  clear$1(editorUid);
   dispose$1(editorUid);
   const pending = [];
   if (getEnabled$1()) {
@@ -7308,6 +7323,20 @@ const create$8 = () => {
   return state$5.nextId++;
 };
 
+const getIndex = (widgets, id) => {
+  for (const [i, widget] of widgets.entries()) {
+    if (widget.id === id) {
+      return i;
+    }
+  }
+  return -1;
+};
+const removeEditorWidget = (widgets, id) => {
+  const index = getIndex(widgets, id);
+  const newWidgets = [...widgets.slice(0, index), ...widgets.slice(index + 1)];
+  return newWidgets;
+};
+
 const Message = 9;
 
 const getAccurateColumnIndexAscii = async (line, guess, averageCharWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth) => {
@@ -7452,21 +7481,32 @@ const at = async (editor, eventX, eventY) => {
 };
 
 /**
- * @deprecated this doesn't work for variable width characters (Unicode/emoji).
- * Use position computation in renderer process instead
- *
- * @param {object} editor
- * @param {number} rowIndex
- * @param {number} columnIndex
- * @returns
+ * @deprecated this doesn't account for variable-width characters, gutters, or horizontal scrolling.
  */
 const x = (editor, rowIndex, columnIndex) => {
   const {
     columnWidth,
     x
   } = editor;
-  const offsetX = columnIndex * columnWidth + x;
-  return offsetX;
+  return columnIndex * columnWidth + x;
+};
+const getCursorX = async (editor, rowIndex, columnIndex) => {
+  const {
+    charWidth,
+    deltaX,
+    fontFamily,
+    fontSize,
+    fontWeight,
+    gutterWidth = 0,
+    isMonospaceFont,
+    letterSpacing,
+    lines,
+    tabSize,
+    width,
+    x
+  } = editor;
+  const textX = await getX(lines[rowIndex] || '', columnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, 0, width, charWidth);
+  return x + gutterWidth + textX - deltaX;
 };
 const y = (editor, rowIndex) => {
   const {
@@ -7478,6 +7518,8 @@ const y = (editor, rowIndex) => {
   return offsetY;
 };
 
+const defaultMessageDelay = 3000;
+
 /**
  *
  * @param {any} editor
@@ -7488,29 +7530,54 @@ const y = (editor, rowIndex) => {
  * @returns
  */
 // @ts-ignore
-const editorShowMessage = (editor, rowIndex, columnIndex, message, _isError) => {
+const editorShowMessage = async (editor, rowIndex, columnIndex, message, _isError) => {
   object(editor);
   number(rowIndex);
   number(columnIndex);
   string(message);
-  const x$1 = x(editor, rowIndex, columnIndex);
+  const x = await getCursorX(editor, rowIndex, columnIndex);
   const y$1 = y(editor, rowIndex);
   const existingWidget = editor.widgets.find(widget => widget.id === Message);
   const uid = existingWidget?.newState.uid ?? create$8();
   const newState = {
     message,
     uid,
-    x: x$1,
+    x,
     y: y$1
   };
   const widget = {
     id: Message,
     newState
   };
-  return {
+  const newEditor = {
     ...editor,
     widgets: [...editor.widgets.filter(item => item.id !== Message), widget]
   };
+  if (typeof editor.uid === 'number') {
+    const timeout = setTimeout(async () => {
+      clear$1(editor.uid);
+      const latestInstance = get$8(editor.uid);
+      if (!latestInstance) {
+        return;
+      }
+      const latestEditor = latestInstance.newState;
+      const latestWidget = latestEditor.widgets.find(item => item.id === Message);
+      if (latestWidget?.newState.uid !== uid) {
+        return;
+      }
+      const editorWithoutMessage = {
+        ...latestEditor,
+        widgetRevision: next(editor.uid),
+        widgets: removeEditorWidget(latestEditor.widgets, Message)
+      };
+      set$a(editor.uid, latestEditor, editorWithoutMessage);
+      await invoke$d('Editor.renderPending', editor.uid);
+    }, editor.messageDelay ?? defaultMessageDelay);
+    set$2(editor.uid, {
+      timeout
+    });
+  }
+  return newEditor;
 };
 
 /**
@@ -7522,8 +7589,8 @@ const editorShowMessage = (editor, rowIndex, columnIndex, message, _isError) =>
  * @returns
  */
 // @ts-ignore
-const showErrorMessage = (editor, rowIndex, columnIndex, message) => {
-  return editorShowMessage(editor, rowIndex, columnIndex, message);
+const showErrorMessage = async (editor, rowIndex, columnIndex, message) => {
+  return await editorShowMessage(editor, rowIndex, columnIndex, message);
 };
 
 const expectedErrorMessage = 'Failed to execute formatting provider: FormattingError:';
@@ -7587,7 +7654,6 @@ const saveUntitledFile = async (uri, content, platform, applicationId) => {
   }
   await invoke$9(applicationId, 'FileSystem.writeFile', filePath, content);
   await invoke$9(applicationId, 'Layout.handleWorkspaceRefresh');
-  await invoke$9(applicationId, 'Main.handleUriChange', uri, filePath);
   return filePath;
 };
 
@@ -7616,7 +7682,7 @@ const showSaveErrorDialog = async error => {
   });
 };
 
-const save = async (editor, skipFormatting = false) => {
+const save$1 = async (editor, skipFormatting = false) => {
   try {
     const {
       applicationId,
@@ -7692,7 +7758,7 @@ const handleBlur$1 = async editor => {
   if (autoSave !== 'onFocusChange') {
     return newEditor;
   }
-  return save(newEditor);
+  return save$1(newEditor);
 };
 
 const replaceRange = (editor, ranges, replacement, origin) => {
@@ -7791,20 +7857,6 @@ const getCursorOffset = editor => {
   return offsetAt(editor, editor.selections[0], editor.selections[1]);
 };
 
-const getIndex = (widgets, id) => {
-  for (const [i, widget] of widgets.entries()) {
-    if (widget.id === id) {
-      return i;
-    }
-  }
-  return -1;
-};
-const removeEditorWidget = (widgets, id) => {
-  const index = getIndex(widgets, id);
-  const newWidgets = [...widgets.slice(0, index), ...widgets.slice(index + 1)];
-  return newWidgets;
-};
-
 const cancelSelection = editor => {
   const {
     selections,
@@ -10193,14 +10245,14 @@ const handleMouseLeave = (viewletUid, editorUidValue) => {
   const {
     widgets = []
   } = instance.newState;
-  clear$1(editorUid);
   clear$2(editorUid);
+  clear$3(editorUid);
   const hoverWidget = widgets.find(widget => widget.id === Hover);
   if (!hoverWidget) {
     return;
   }
   const timeout = setTimeout(async () => {
-    clear$2(editorUid);
+    clear$3(editorUid);
     const latestInstance = get$8(editorUid);
     if (!latestInstance) {
       return;
@@ -10218,16 +10270,16 @@ const handleMouseLeave = (viewletUid, editorUidValue) => {
       widgetRevision: next(editorUid),
       widgets: removeEditorWidget(latestEditor.widgets, Hover)
     };
-    set$9(editorUid, latestEditor, newEditor);
+    set$a(editorUid, latestEditor, newEditor);
     await invoke$d('Editor.renderPending', editorUid);
   }, editorHoverDismissDelay);
-  set$3(editorUid, {
+  set$4(editorUid, {
     timeout
   });
 };
 const handleMouseEnter = (viewletUid, editorUidValue) => {
   const targetEditorUid = editorUidValue ?? viewletUid;
-  clear$2(Number(targetEditorUid));
+  clear$3(Number(targetEditorUid));
 };
 
 const RE_ALPHA_NUMERIC = /[a-zA-Z\d]/;
@@ -10651,7 +10703,7 @@ const showHover = async (editor, position, token) => {
   if (latestEditor === newEditor || !latestInstance || latestInstance.newState !== latestEditor || get$2().token !== token) {
     return;
   }
-  set$9(editor.uid, latestInstance.oldState, newEditor);
+  set$a(editor.uid, latestInstance.oldState, newEditor);
   await invoke$d('Editor.renderPending', editor.uid);
 };
 
@@ -10685,7 +10737,7 @@ const onHoverIdle = async token => {
   }
 };
 const handleMouseMove = async (editor, x, y, altKey) => {
-  clear$1();
+  clear$2();
   if (altKey) {
     return handleMouseMoveWithAltKey(editor, x, y);
   }
@@ -10695,7 +10747,7 @@ const handleMouseMove = async (editor, x, y, altKey) => {
   }
   const token = create$8();
   const timeout = setTimeout(onHoverIdle, editorWithoutDefinitionLink.hoverDelay ?? 200, token);
-  set$2(editorWithoutDefinitionLink, timeout, x, y, token);
+  set$3(editorWithoutDefinitionLink, timeout, x, y, token);
   return editorWithoutDefinitionLink;
 };
 
@@ -10913,7 +10965,7 @@ const continueScrollingAndMovingSelection = async editorUid => {
     }
     return;
   }
-  set$9(editor.uid, editor, derivedEditor);
+  set$a(editor.uid, editor, derivedEditor);
   if (derivedEditor.hasListener) {
     requestAnimationFrame(() => continueScrollingAndMovingSelection(editorUid));
   }
@@ -11702,7 +11754,7 @@ const updateEditor = async (editorUid, editor, newEditor) => {
     return;
   }
   const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
-  set$9(editorUid, editor, newEditorWithDerivedState);
+  set$a(editorUid, editor, newEditorWithDerivedState);
 };
 const applyDocumentEdits = async (editorUid, edits) => {
   const editor = getEditor$1(editorUid);
@@ -11752,7 +11804,7 @@ const launch = async () => {
     return;
   }
   const rpc = await launchFindWidgetWorker();
-  set$i(rpcId, rpc);
+  set$j(rpcId, rpc);
 };
 const invoke$3 = async (method, ...params) => {
   const rpc = get$9(rpcId);
@@ -11883,7 +11935,7 @@ const createFn = (key, name, widgetId) => {
     const latestAfterInvoke = get$8(editor.uid).newState;
     const latestChildIndex = latestAfterInvoke.widgets.findIndex(isWidget);
     if (latestChildIndex === -1) {
-      set$9(editor.uid, editor, latestAfterInvoke);
+      set$a(editor.uid, editor, latestAfterInvoke);
       await dispose$3();
       return latestAfterInvoke;
     }
@@ -11897,7 +11949,7 @@ const createFn = (key, name, widgetId) => {
         widgetRevision,
         widgets: removeEditorWidget(latest.widgets, widgetId)
       };
-      set$9(editor.uid, latest, newEditor);
+      set$a(editor.uid, latest, newEditor);
       return newEditor;
     }
     const newState = {
@@ -11905,7 +11957,7 @@ const createFn = (key, name, widgetId) => {
       commands
     };
     const newEditor = updateWidget(latest, widgetId, newState);
-    set$9(editor.uid, editor, newEditor);
+    set$a(editor.uid, editor, newEditor);
     return newEditor;
   };
   return fn;
@@ -12935,7 +12987,7 @@ const setLanguageId = async (editor, languageId, tokenizePath, isExplicit = fals
   await loadTokenizer(languageId, tokenizePath);
   const tokenizer = getTokenizer(languageId);
   const newTokenizerId = tokenizerId + 1;
-  set$4(newTokenizerId, tokenizer);
+  set$5(newTokenizerId, tokenizer);
   return {
     ...editor,
     explicitLanguageId: isExplicit ? languageId : editor.explicitLanguageId,
@@ -14940,7 +14992,7 @@ const setSelections2 = async (editorUid, selections) => {
   const editor = getEditor$1(editorUid);
   const newEditor = setSelections$2(editor, selections);
   const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
-  set$9(editorUid, editor, newEditorWithDerivedState);
+  set$a(editorUid, editor, newEditorWithDerivedState);
 };
 const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocus$1) => {
   const editor = getEditor$1(editorUid);
@@ -14964,7 +15016,7 @@ const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocu
     widgets: newWidgets
   };
   const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
-  set$9(editorUid, editor, newEditorWithDerivedState);
+  set$a(editorUid, editor, newEditorWithDerivedState);
   await setFocus(FocusEditorText);
   if (unsetAdditionalFocus$1) {
     await unsetAdditionalFocus(unsetAdditionalFocus$1);
@@ -14977,7 +15029,7 @@ const applyEdits2 = async (editorUid, edits, selectionChanges) => {
   const editor = getEditor$1(editorUid);
   const newEditor = await applyEdit(editor, edits, selectionChanges);
   const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
-  set$9(editorUid, editor, newEditorWithDerivedState);
+  set$a(editorUid, editor, newEditorWithDerivedState);
 };
 const getSourceActions = async editorUid => {
   const actions = await getEditorSourceActions(editorUid);
@@ -15651,7 +15703,7 @@ const handleMessagePort = async (port, rpcId) => {
     messagePort: port
   });
   if (rpcId) {
-    set$i(rpcId, rpc);
+    set$j(rpcId, rpc);
     await initializeListener(rpcId);
   }
 };
@@ -15769,6 +15821,8 @@ const getMergeConflictActionsEnabled = async () => {
 };
 
 const DEFAULT_HOVER_DELAY = 200;
+const DEFAULT_MESSAGE_DELAY = 3000;
+const MAX_MESSAGE_DELAY = 10_000;
 const getHoverDelay = value => {
   const delay = typeof value === 'number' ? value : Number(value);
   if (!Number.isFinite(delay) || delay < 0) {
@@ -15776,8 +15830,15 @@ const getHoverDelay = value => {
   }
   return delay;
 };
+const getMessageDelay = value => {
+  const delay = typeof value === 'number' ? value : Number(value);
+  if (!Number.isFinite(delay) || delay < 0 || delay > MAX_MESSAGE_DELAY) {
+    return DEFAULT_MESSAGE_DELAY;
+  }
+  return delay;
+};
 const getEditorPreferences = async () => {
-  const [diagnosticsEnabled, fontFamily, fontSize, fontWeight, formatOnSave, hoverEnabled, hoverDelay, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, highlightActiveLineNumber, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, mergeConflictActionsEnabled, breadcrumbsEnabled, insertSpaces, dragAndDropEnabled, roundedSelection, combineWhitespaceTokens] = await Promise.all([get$3('editor.diagnostics'), getFontFamily(), getFontSize(), getFontWeight(), get$3('editor.formatOnSave'), get$3('editor.hover'), get$3('editor.hoverDelay'), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getHighlightActiveLineNumber(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getMergeConflictActionsEnabled(), get$3('breadcrumbs.enabled'), get$3('editor.insertSpaces'), get$3('editor.dragAndDrop'), get$3('editor.roundedSelection'), get$3('editor.combineWhitespaceTokens')]);
+  const [diagnosticsEnabled, fontFamily, fontSize, fontWeight, formatOnSave, hoverEnabled, hoverDelay, messageDelay, isAutoClosingBracketsEnabled$1, isAutoClosingQuotesEnabled$1, isAutoClosingTagsEnabled$1, isQuickSuggestionsEnabled$1, lineNumbers, highlightActiveLineNumber, rowHeight, tabSize, letterSpacing, completionTriggerCharacters, minimapEnabled, mergeConflictActionsEnabled, breadcrumbsEnabled, insertSpaces, dragAndDropEnabled, roundedSelection, combineWhitespaceTokens] = await Promise.all([get$3('editor.diagnostics'), getFontFamily(), getFontSize(), getFontWeight(), get$3('editor.formatOnSave'), get$3('editor.hover'), get$3('editor.hoverDelay'), get$3('editor.messageDelay'), isAutoClosingBracketsEnabled(), isAutoClosingQuotesEnabled(), isAutoClosingTagsEnabled(), isQuickSuggestionsEnabled(), getLineNumbers(), getHighlightActiveLineNumber(), getRowHeight(), getTabSize(), getLetterSpacing(), getCompletionTriggerCharacters(), getMinimapEnabled(), getMergeConflictActionsEnabled(), get$3('breadcrumbs.enabled'), get$3('editor.insertSpaces'), get$3('editor.dragAndDrop'), get$3('editor.roundedSelection'), get$3('editor.combineWhitespaceTokens')]);
   return {
     breadcrumbsEnabled: breadcrumbsEnabled ?? false,
     combineWhitespaceTokens: combineWhitespaceTokens ?? true,
@@ -15799,6 +15860,7 @@ const getEditorPreferences = async () => {
     letterSpacing,
     lineNumbers,
     mergeConflictActionsEnabled,
+    messageDelay: getMessageDelay(messageDelay),
     minimapEnabled,
     roundedSelection: roundedSelection === true,
     rowHeight,
@@ -15873,7 +15935,7 @@ const handleSettingsChanged = async state => {
     visualDecorations: diagnosticsEnabled ? state.visualDecorations : []
   };
   if (!editorWithUpdatedSettings.hoverEnabled) {
-    clear$1(state.uid);
+    clear$2(state.uid);
   }
   let documentSymbols = state.documentSymbols || [];
   let workspaceUri = state.workspaceUri || '';
@@ -16058,7 +16120,7 @@ const hotReload = async () => {
     await relaunchWorkers();
     const newEditors = await restoreWidgetState(keys, savedStates);
     for (const editor of newEditors) {
-      set$9(editor.newState.uid, editor.oldState, editor.newState);
+      set$a(editor.newState.uid, editor.oldState, editor.newState);
     }
 
     // TODO ask renderer worker to rerender all editors
@@ -16096,7 +16158,7 @@ const initializeSyntaxHighlighting = async (syntaxHighlightingEnabled, syncIncre
   if (syntaxHighlightingEnabled) {
     setEnabled$1(true);
     const syntaxRpc = await createSyntaxHighlightingWorkerRpc();
-    set$7(syntaxRpc);
+    set$8(syntaxRpc);
   }
   if (syncIncremental) {
     setEnabled(true);
@@ -16293,7 +16355,7 @@ const loadContent = async (state, savedState, largeFile = false, focus = true) =
     await loadTokenizer(computedLanguageId, tokenizePath);
     const tokenizer = getTokenizer(computedLanguageId);
     const newTokenizerId = state.tokenizerId + 1;
-    set$4(newTokenizerId, tokenizer);
+    set$5(newTokenizerId, tokenizer);
     effectiveEditor.tokenizerId = newTokenizerId;
   }
   const savedHistory = existingEditor ? undefined : getSavedHistory(savedState, content);
@@ -16437,7 +16499,7 @@ const refreshGutterDecorationsAll = async () => {
       if (!latest) {
         continue;
       }
-      set$9(editor.id, latest.oldState, {
+      set$a(editor.id, latest.oldState, {
         ...latest.newState,
         gutterDecorations: refreshedEditor.gutterDecorations
       });
@@ -17748,7 +17810,7 @@ const render2 = (uid, _diffResult) => {
   } = editor;
   // Diagnostics can change after the caller calculated its diff in a separate RPC.
   const diffResult = diff(oldState, newState);
-  set$9(uid, newState, newState);
+  set$a(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -17858,7 +17920,7 @@ const renderEditor = async id => {
     oldState
   } = instance;
   const commands = [];
-  set$9(id, newState, newState);
+  set$a(id, newState, newState);
   for (const item of render$7) {
     if (item.isEqual(oldState, newState)) {
       continue;
@@ -17992,92 +18054,6 @@ const revealProblem = (editor, rowIndex, columnIndex) => {
   };
 };
 
-const saveState = (state, savedState) => {
-  const {
-    explicitLanguageId,
-    largeFile,
-    lines,
-    redoStack,
-    undoStack
-  } = state;
-  return {
-    ...(explicitLanguageId && {
-      explicitLanguageId
-    }),
-    ...(largeFile && {
-      largeFile: true
-    }),
-    ...((redoStack.length > 0 || undoStack.length > 0) && {
-      lines,
-      redoStack,
-      undoStack
-    })
-  };
-};
-
-const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
-  await sendMessagePortToExtensionManagementWorker$1(port, rpcId);
-};
-const sendDeprecatedExtensionHostPortToExtensionManagementWorker = async (port, _initialCommand, rpcId) => {
-  await sendMessagePortToExtensionManagementWorker$1(port, rpcId);
-};
-
-const setDebugEnabled = (state, enabled) => {
-  return state;
-};
-
-const toggleMinimap = async () => {
-  const minimapEnabled = await getMinimapEnabled();
-  await update({
-    'editor.minimap.enabled': !minimapEnabled
-  });
-};
-
-/**
- * Unregister a listener for editor events
- * @param listenerType - The type of event to stop listening for
- * @param rpcId - The RPC ID of the listener to unregister
- */
-const unregisterListener = (listenerType, rpcId) => {
-  number(listenerType);
-  number(rpcId);
-  unregisterListener$1(listenerType, rpcId);
-};
-
-const invoke = async (method, ...params) => {
-  const worker = get$9(DebugWorker);
-  return worker.invoke(method, ...params);
-};
-
-const getDebugHighlight = async debugId => {
-  const newInfo = await invoke('RunAndDebug.getHighlight', debugId);
-  return newInfo;
-};
-
-const getKey = () => {
-  const keys = getKeys$2();
-  return parseInt(keys[0]);
-};
-const updateDebugInfo = async debugId => {
-  const newInfo = await getDebugHighlight(debugId);
-  const key = getKey();
-  const instance = get$8(key);
-  if (!instance) {
-    return;
-  }
-  const {
-    newState,
-    oldState
-  } = instance;
-  const newEditor = {
-    ...newState,
-    highlightedLine: newInfo.rowIndex
-  };
-  set$9(key, oldState, newEditor);
-  // @ts-ignore
-  await invoke$d('Editor.rerender', key);
-};
-
 const editorDiagnosticEffect = {
   // TODO set effects delay / diagnostic delay
   apply(editor) {
@@ -18107,7 +18083,7 @@ const saveAfterDelay = async (uid, token) => {
     return;
   }
   let didSave = false;
-  const save$1 = wrapCommand$1(async editor => {
+  const save = wrapCommand$1(async editor => {
     if (!isLatest(uid, token)) {
       return editor;
     }
@@ -18116,11 +18092,11 @@ const saveAfterDelay = async (uid, token) => {
     if (autoSave !== 'afterDelay') {
       return editor;
     }
-    const savedEditor = await save(editor);
+    const savedEditor = await save$1(editor);
     didSave = savedEditor !== editor;
     return savedEditor;
   });
-  await save$1(uid);
+  await save(uid);
   if (didSave) {
     await invoke$d('Editor.renderPending', uid);
   }
@@ -18170,7 +18146,7 @@ const wrapCommand$1 = (fn, preservesTypingCoalescing = false, returnState = true
       return returnState ? newEditor : undefined;
     }
     const newEditorWithDerivedState = await updateDerivedState(state, newEditor);
-    set$9(uid, state, newEditorWithDerivedState);
+    set$a(uid, state, newEditorWithDerivedState);
     await dispose$3();
     if (editorDiagnosticEffect.isActive(state, newEditorWithDerivedState)) {
       void editorDiagnosticEffect.apply(newEditorWithDerivedState);
@@ -18199,7 +18175,7 @@ const wrapCommand$1 = (fn, preservesTypingCoalescing = false, returnState = true
           undoStack: finalEditor.undoStack,
           visualDecorations: finalEditor.visualDecorations
         });
-        set$9(otherUid, instance.oldState, synchronizedEditor);
+        set$a(otherUid, instance.oldState, synchronizedEditor);
         if (editorDiagnosticEffect.isActive(editor, synchronizedEditor)) {
           void editorDiagnosticEffect.apply(synchronizedEditor);
         }
@@ -18240,6 +18216,105 @@ const wrapDeferredCommand$1 = (fn, returnState = true) => {
   };
 };
 
+const save = async (uid, skipFormatting = false) => {
+  let savedFrom;
+  const saveContent = wrapCommand$1(async editor => {
+    savedFrom = editor;
+    return save$1(editor, skipFormatting);
+  });
+  const saved = await saveContent(uid);
+  if (savedFrom && saved && savedFrom.uri !== saved.uri) {
+    // Retargeting calls Editor.handleUriChange, so release the editing queue first.
+    await invoke$9(savedFrom.applicationId, 'Main.handleUriChange', savedFrom.uri, saved.uri);
+  }
+};
+
+const saveState = (state, savedState) => {
+  const {
+    explicitLanguageId,
+    largeFile,
+    lines,
+    redoStack,
+    undoStack
+  } = state;
+  return {
+    ...(explicitLanguageId && {
+      explicitLanguageId
+    }),
+    ...(largeFile && {
+      largeFile: true
+    }),
+    ...((redoStack.length > 0 || undoStack.length > 0) && {
+      lines,
+      redoStack,
+      undoStack
+    })
+  };
+};
+
+const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
+  await sendMessagePortToExtensionManagementWorker$1(port, rpcId);
+};
+const sendDeprecatedExtensionHostPortToExtensionManagementWorker = async (port, _initialCommand, rpcId) => {
+  await sendMessagePortToExtensionManagementWorker$1(port, rpcId);
+};
+
+const setDebugEnabled = (state, enabled) => {
+  return state;
+};
+
+const toggleMinimap = async () => {
+  const minimapEnabled = await getMinimapEnabled();
+  await update({
+    'editor.minimap.enabled': !minimapEnabled
+  });
+};
+
+/**
+ * Unregister a listener for editor events
+ * @param listenerType - The type of event to stop listening for
+ * @param rpcId - The RPC ID of the listener to unregister
+ */
+const unregisterListener = (listenerType, rpcId) => {
+  number(listenerType);
+  number(rpcId);
+  unregisterListener$1(listenerType, rpcId);
+};
+
+const invoke = async (method, ...params) => {
+  const worker = get$9(DebugWorker);
+  return worker.invoke(method, ...params);
+};
+
+const getDebugHighlight = async debugId => {
+  const newInfo = await invoke('RunAndDebug.getHighlight', debugId);
+  return newInfo;
+};
+
+const getKey = () => {
+  const keys = getKeys$2();
+  return parseInt(keys[0]);
+};
+const updateDebugInfo = async debugId => {
+  const newInfo = await getDebugHighlight(debugId);
+  const key = getKey();
+  const instance = get$8(key);
+  if (!instance) {
+    return;
+  }
+  const {
+    newState,
+    oldState
+  } = instance;
+  const newEditor = {
+    ...newState,
+    highlightedLine: newInfo.rowIndex
+  };
+  set$a(key, oldState, newEditor);
+  // @ts-ignore
+  await invoke$d('Editor.rerender', key);
+};
+
 // State and undo history belong in this worker. Rendering reads changes separately.
 const wrapCommand = (fn, preservesTypingCoalescing = false) => {
   return wrapCommand$1(fn, preservesTypingCoalescing, false);
@@ -18427,7 +18502,7 @@ const commandMap = {
   'Editor.rerender': wrapCommand(rerender),
   'Editor.resize': wrapCommand(resize),
   'Editor.revealProblem': wrapCommand(revealProblem),
-  'Editor.save': wrapCommand(save),
+  'Editor.save': save,
   'Editor.saveState': wrapGetter(saveState),
   'Editor.scrollByLines': wrapCommand(scrollByLines),
   'Editor.selectAll': wrapCommand(selectAll),
@@ -18578,7 +18653,7 @@ const initializeDragAndDropWorker = async () => {
     commandMap: {},
     send: sendMessagePortToDragAndDropWorker
   });
-  set$g(rpc);
+  set$h(rpc);
 };
 
 const initializeErrorWorker = async () => {
@@ -18588,7 +18663,7 @@ const initializeErrorWorker = async () => {
       return sendMessagePortToErrorWorker(port, EditorWorker);
     }
   });
-  set$f(rpc);
+  set$g(rpc);
 };
 
 const createExtensionManagementWorkerRpc = async () => {
@@ -18604,7 +18679,7 @@ const createExtensionManagementWorkerRpc = async () => {
 const initializeExtensionManagementWorker = async () => {
   try {
     const rpc = await createExtensionManagementWorkerRpc();
-    set$e(rpc);
+    set$f(rpc);
   } catch {
     // ignore
   }
@@ -18619,14 +18694,14 @@ const initializeOpenerWorker = async () => {
     commandMap: {},
     send: send$1
   });
-  set$d(rpc);
+  set$e(rpc);
 };
 
 const initializeRendererWorker = async () => {
   const rpc = await create$d({
     commandMap: commandMap
   });
-  set$b(rpc);
+  set$c(rpc);
 };
 
 const send = port => {
@@ -18637,7 +18712,7 @@ const initializeTextMeasurementWorker = async () => {
     commandMap: {},
     send
   });
-  set$c(rpc);
+  set$d(rpc);
 };
 
 const listen = async () => {
@@ -18647,7 +18722,7 @@ const listen = async () => {
     commandMap: {},
     send: sendMessagePortToDialogWorker
   });
-  set$h(dialogRpc);
+  set$i(dialogRpc);
 };
 
 const CodeGeneratorInput = 'CodeGeneratorInput';
@@ -18969,15 +19044,15 @@ const EditorMessageWidget = {
 };
 
 const registerWidgets = () => {
-  set$8(ColorPicker$2, EditorColorPickerWidget);
-  set$8(Completion, EditorCompletionWidget);
-  set$8(CompletionDetail, EditorCompletionDetailWidget);
-  set$8(Find, EditorFindWidget);
-  set$8(Hover, EditorHoverWidget);
-  set$8(Message, EditorMessageWidget);
-  set$8(Rename$1, EditorRenameWidget);
-  set$8(SourceAction$1, EditorSourceActionWidget);
-  set$8(CodeGenerator, EditorCodeGeneratorWidget);
+  set$9(ColorPicker$2, EditorColorPickerWidget);
+  set$9(Completion, EditorCompletionWidget);
+  set$9(CompletionDetail, EditorCompletionDetailWidget);
+  set$9(Find, EditorFindWidget);
+  set$9(Hover, EditorHoverWidget);
+  set$9(Message, EditorMessageWidget);
+  set$9(Rename$1, EditorRenameWidget);
+  set$9(SourceAction$1, EditorSourceActionWidget);
+  set$9(CodeGenerator, EditorCodeGeneratorWidget);
 };
 
 const handleUnhandledRejection = event => {

package/dist/settings.json

@@ -791,6 +791,16 @@
     "minimum": 0,
     "maximum": 10000
   },
+  {
+    "category": "text-editor",
+    "description": "Controls how long editor messages remain visible, in milliseconds",
+    "heading": "Message Display Duration",
+    "id": "editor.messageDelay",
+    "type": "number",
+    "value": 3000,
+    "minimum": 0,
+    "maximum": 10000
+  },
   {
     "category": "text-editor",
     "description": "Controls whether the editor should be in a diff editor",

package/package.json

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