@lvce-editor/editor-worker 19.56.1 → 19.57.0

package/dist/editorWorkerMain.js

@@ -15996,17 +15996,55 @@ const notifyDiagnosticsChange = async uri => {
     // Older renderer workers do not support diagnostics change listeners.
   }
 };
+const diagnosticsEqual = (left, right) => {
+  if (left === right) {
+    return true;
+  }
+  if ((left?.length ?? 0) !== right.length) {
+    return false;
+  }
+  return right.every((diagnostic, index) => {
+    const other = left[index];
+    return other.code === diagnostic.code && other.columnIndex === diagnostic.columnIndex && other.endColumnIndex === diagnostic.endColumnIndex && other.endRowIndex === diagnostic.endRowIndex && other.message === diagnostic.message && other.rowIndex === diagnostic.rowIndex && other.source === diagnostic.source && other.type === diagnostic.type && other.uri === diagnostic.uri;
+  });
+};
+const diagnosticLayoutEqual = (left, right) => left.charWidth === right.charWidth && left.deltaY === right.deltaY && left.fontFamily === right.fontFamily && left.fontSize === right.fontSize && left.fontWeight === right.fontWeight && left.isMonospaceFont === right.isMonospaceFont && left.itemHeight === right.itemHeight && left.letterSpacing === right.letterSpacing && left.lines === right.lines && left.minLineY === right.minLineY && left.rowHeight === right.rowHeight && left.tabSize === right.tabSize && left.viewLineIndices === right.viewLineIndices && left.width === right.width;
+const isApplicable = (latest, editor) => latest && latest.newState.diagnosticsEnabled && latest.newState.lines === editor.lines && latest.newState.uri === editor.uri;
+const mergeDiagnostics = (editor, editorWithDiagnostics) => ({
+  ...editor,
+  decorations: editorWithDiagnostics.decorations,
+  diagnostics: editorWithDiagnostics.diagnostics,
+  lightBulbRowIndex: editorWithDiagnostics.lightBulbRowIndex,
+  visualDecorations: editorWithDiagnostics.visualDecorations
+});
 const updateDiagnostics = async editor => {
   if (!editor.diagnosticsEnabled) {
     return editor;
   }
   try {
     const diagnostics = await getDiagnostics(editor);
-    const latest = get$8(editor.id);
-    if (!latest || !latest.newState.diagnosticsEnabled || latest.newState.lines !== editor.lines || latest.newState.uri !== editor.uri) {
+    let latest = get$8(editor.id);
+    if (!isApplicable(latest, editor)) {
+      return editor;
+    }
+    if (diagnosticsEqual(latest.newState.diagnostics, diagnostics)) {
+      return latest.newState;
+    }
+    let calculationState = latest.newState;
+    let editorWithDiagnostics = await addDiagnostics(calculationState, diagnostics);
+    latest = get$8(editor.id);
+    while (isApplicable(latest, editor) && !diagnosticLayoutEqual(calculationState, latest.newState)) {
+      calculationState = latest.newState;
+      editorWithDiagnostics = await addDiagnostics(calculationState, diagnostics);
+      latest = get$8(editor.id);
+    }
+    if (!isApplicable(latest, editor)) {
       return editor;
     }
-    const newEditor = await addDiagnostics(latest.newState, diagnostics);
+    if (diagnosticsEqual(latest.newState.diagnostics, diagnostics)) {
+      return latest.newState;
+    }
+    const newEditor = mergeDiagnostics(latest.newState, editorWithDiagnostics);
     set$8(editor.id, latest.oldState, newEditor);
     await invoke$7('Editor.renderPending', newEditor.id);
     await notifyDiagnosticsChange(newEditor.uri);

package/package.json

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