@lvce-editor/editor-worker 19.70.6 → 19.70.7

package/dist/editorWorkerMain.js

@@ -7654,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;
 };
 
@@ -7683,7 +7682,7 @@ const showSaveErrorDialog = async error => {
   });
 };
 
-const save = async (editor, skipFormatting = false) => {
+const save$1 = async (editor, skipFormatting = false) => {
   try {
     const {
       applicationId,
@@ -7759,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) => {
@@ -18055,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$a(key, oldState, newEditor);
-  // @ts-ignore
-  await invoke$d('Editor.rerender', key);
-};
-
 const editorDiagnosticEffect = {
   // TODO set effects delay / diagnostic delay
   apply(editor) {
@@ -18170,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;
     }
@@ -18179,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);
   }
@@ -18303,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);
@@ -18490,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),

package/package.json

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