@lvce-editor/editor-worker 19.27.1 → 19.27.2

package/dist/editorWorkerMain.js

@@ -12182,9 +12182,19 @@ const loadContent = async (state, savedState) => {
     tabSize,
     tokenizerId: newTokenizerId
   };
-  let content = '';
+  let existingEditor;
+  for (const key of getKeys$2()) {
+    const editor = get$7(Number(key))?.newState;
+    if (editor && editor.id !== id && !editor.initial && editor.uri === uri) {
+      existingEditor = editor;
+      break;
+    }
+  }
+  let content = existingEditor ? getText$1(existingEditor) : '';
   try {
-    content = await readFile(uri);
+    if (!existingEditor) {
+      content = await readFile(uri);
+    }
   } catch (error) {
     const newEditor1 = setBounds(newEditor0, x, y, width, height, 9);
     return {
@@ -12231,7 +12241,10 @@ const loadContent = async (state, savedState) => {
   const newEditor5 = {
     ...newEditor4,
     completionsOnType,
-    initial: false
+    initial: false,
+    modified: existingEditor?.modified || false,
+    redoStack: existingEditor?.redoStack || [],
+    undoStack: existingEditor?.undoStack || []
   };
   return newEditor5;
 };
@@ -13463,18 +13476,20 @@ const editorDiagnosticEffect = {
   isActive: (oldEditor, newEditor) => newEditor.diagnosticsEnabled && JSON.stringify(oldEditor.lines) !== JSON.stringify(newEditor.lines)
 };
 
-const queues = [];
+const queues = {};
 
 // TODO wrap commands globally, not per editor
 // TODO only store editor state in editor worker, not in renderer worker also
 
 const wrapCommand = fn => async (uid, ...args) => {
-  const previous = queues[uid];
+  const initialInstance = get$7(uid);
+  const queueKey = initialInstance?.newState.uri || uid;
+  const previous = queues[queueKey];
   const {
     promise: next,
     resolve
   } = Promise.withResolvers();
-  queues[uid] = next;
+  queues[queueKey] = next;
   if (previous) {
     await previous;
   }
@@ -13487,19 +13502,50 @@ const wrapCommand = fn => async (uid, ...args) => {
     }
     const newEditorWithDerivedState = await updateDerivedState(state, newEditor);
     set$9(uid, state, newEditorWithDerivedState);
-    if (!editorDiagnosticEffect.isActive(state, newEditorWithDerivedState)) {
-      return newEditorWithDerivedState;
+    let finalEditor = newEditorWithDerivedState;
+    if (editorDiagnosticEffect.isActive(state, newEditorWithDerivedState)) {
+      finalEditor = await editorDiagnosticEffect.apply(newEditorWithDerivedState);
+      if (!get$7(uid)) {
+        return finalEditor;
+      }
+      set$9(uid, state, finalEditor);
     }
-    const newEditorWithDiagnostics = await editorDiagnosticEffect.apply(newEditorWithDerivedState);
-    if (!get$7(uid)) {
-      return newEditorWithDiagnostics;
+    const {
+      initial,
+      lines,
+      modified,
+      redoStack,
+      undoStack,
+      uri
+    } = state;
+    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 editor = instance?.newState;
+        if (otherUid === uid || !instance || !editor || editor.initial || editor.uri !== finalEditor.uri) {
+          continue;
+        }
+        const synchronizedEditor = await updateDerivedState(editor, {
+          ...editor,
+          decorations: finalEditor.decorations,
+          diagnostics: finalEditor.diagnostics,
+          incrementalEdits: emptyIncrementalEdits,
+          invalidStartIndex: Math.min(editor.invalidStartIndex, finalEditor.invalidStartIndex),
+          lines: finalEditor.lines,
+          modified: finalEditor.modified,
+          redoStack: finalEditor.redoStack,
+          undoStack: finalEditor.undoStack,
+          visualDecorations: finalEditor.visualDecorations
+        });
+        set$9(otherUid, instance.oldState, synchronizedEditor);
+      }
     }
-    set$9(uid, state, newEditorWithDiagnostics);
-    return newEditorWithDiagnostics;
+    return finalEditor;
   } finally {
     resolve();
-    if (queues[uid] === next) {
-      queues[uid] = undefined;
+    if (queues[queueKey] === next) {
+      delete queues[queueKey];
     }
   }
 };

package/package.json

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