@lvce-editor/editor-worker 19.73.0 → 19.73.1

package/dist/editorWorkerMain.js

@@ -7189,6 +7189,43 @@ const {
   setFactory
 } = createLazyRpc(CompletionWorker);
 
+// These commits preserve the document, selection, layout, widgets and lifecycle.
+const diagnosticFields = new Set(['decorations', 'diagnostics', 'lightBulbRowIndex', 'visualDecorations']);
+const isCurrent$1 = (snapshot, current) => {
+  if (!current || current.lifecycle?.disposed) {
+    return false;
+  }
+  if (snapshot === current) {
+    return true;
+  }
+  const keys = new Set([...Object.keys(snapshot), ...Object.keys(current)]);
+  for (const key of keys) {
+    if (diagnosticFields.has(key)) {
+      continue;
+    }
+    const field = key;
+    if (Object.hasOwn(snapshot, field) !== Object.hasOwn(current, field) || snapshot[field] !== current[field]) {
+      return false;
+    }
+  }
+  return true;
+};
+const merge = (current, snapshot, result) => {
+  if (!isCurrent$1(snapshot, current) || result === snapshot || result === current) {
+    return current;
+  }
+  if (current === snapshot) {
+    return result;
+  }
+  return {
+    ...result,
+    decorations: current.decorations,
+    diagnostics: current.diagnostics,
+    lightBulbRowIndex: current.lightBulbRowIndex,
+    visualDecorations: current.visualDecorations
+  };
+};
+
 const updateWidget = (editor, widgetId, newState) => {
   // TODO avoid closure
   const isWidget = widget => {
@@ -7255,7 +7292,7 @@ const openCompletion = async (editor, automatic = false) => {
       uid
     } = widget.newState;
     await invoke$4('Completions.loadContent', uid, automatic);
-    if (get$8(editor.uid)?.newState !== editor) {
+    if (!isCurrent$1(editor, get$8(editor.uid)?.newState)) {
       return get$8(editor.uid)?.newState || editor;
     }
     if (automatic && !(await invoke$4('Completions.hasItems', uid))) {
@@ -7289,7 +7326,7 @@ const openCompletion = async (editor, automatic = false) => {
   const result = await addWidgetToEditor(Completion, EditorCompletion, editor, create$7, generateState, fullFocus);
   const wasAdded = (result?.widgets || []).some(widget => widget.id === Completion && widget.newState.uid === completionUid);
   const currentEditor = get$8(editor.uid)?.newState;
-  if (created && (!wasAdded || currentEditor !== editor)) {
+  if (created && (!wasAdded || !isCurrent$1(editor, currentEditor))) {
     await disposeCompletion(completionUid);
   }
   return result;
@@ -8563,7 +8600,7 @@ const wrapFocusCommand$1 = (fn, returnState = true) => {
 
 // Optional provider work must not hold the editing queue while another worker responds.
 const wrapDeferredCommand$1 = (fn, returnState = true) => {
-  const apply = wrapCommand$1((editor, snapshot, result) => editor === snapshot ? result : editor, false, returnState);
+  const apply = wrapCommand$1((editor, snapshot, result) => merge(editor, snapshot, result), false, returnState);
   return async (uid, ...args) => {
     const snapshot = await enqueue(uid, async () => get$8(uid)?.newState);
     if (!snapshot) {

package/package.json

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