@lvce-editor/editor-worker 19.69.9 → 19.70.0

package/dist/editorWorkerMain.js

@@ -6393,13 +6393,14 @@ const mergeDiagnostics = (editor, editorWithDiagnostics) => ({
   lightBulbRowIndex: editorWithDiagnostics.lightBulbRowIndex,
   visualDecorations: editorWithDiagnostics.visualDecorations
 });
-const commitDiagnostics = async (editor, generation, diagnostics) => {
+const commitDiagnostics = async (editor, generation, diagnostics, onAccepted) => {
   return (await enqueue(editor.id, async () => {
     let latest = get$8(editor.id);
     if (!isApplicable(latest, editor, generation)) {
       return editor;
     }
     if (diagnosticsEqual(latest.newState.diagnostics, diagnostics)) {
+      onAccepted?.();
       return latest.newState;
     }
     let calculationState = latest.newState;
@@ -6419,6 +6420,7 @@ const commitDiagnostics = async (editor, generation, diagnostics) => {
     const newEditor = mergeDiagnostics(latest.newState, editorWithDiagnostics);
     set$9(editor.id, latest.oldState, newEditor);
     requestDiagnosticSnapshots.set(editor.id, diagnostics);
+    onAccepted?.();
     await invoke$5('Editor.renderPending', newEditor.id);
     await notifyDiagnosticsChange(newEditor.uri, newEditor.applicationId);
     return newEditor;
@@ -6429,7 +6431,18 @@ const flattenProviderDiagnostics = providers => {
     diagnostics
   }) => diagnostics);
 };
-const updateDiagnostics = async editor => {
+const saveProviderResults = (editor, providers) => {
+  previousProviderResults.set(editor.id, {
+    languageId: editor.languageId,
+    providers: new Map(providers),
+    uri: editor.uri
+  });
+};
+const updateDiagnostics = async (editor, timeoutMs = 0) => {
+  const strict = timeoutMs > 0;
+  if (strict && editor.loadError) {
+    throw new Error(`Cannot await diagnostics: ${editor.loadError}`);
+  }
   if (!editor.diagnosticsEnabled || editor.loadError) {
     return editor;
   }
@@ -6438,7 +6451,7 @@ const updateDiagnostics = async editor => {
   requestDiagnosticSnapshots.set(editor.id, get$8(editor.id)?.newState.diagnostics ?? editor.diagnostics);
   const providers = new Map();
   const previous = previousProviderResults.get(editor.id);
-  if (previous && previous.languageId === editor.languageId && previous.lines === editor.lines && previous.uri === editor.uri) {
+  if (previous && previous.languageId === editor.languageId && previous.uri === editor.uri) {
     for (const [providerId, result] of previous.providers) {
       providers.set(providerId, result);
     }
@@ -6450,13 +6463,22 @@ const updateDiagnostics = async editor => {
   const completed = Promise.withResolvers();
   let commitQueue = Promise.resolve();
   let providerCount = -1;
+  let finished = false;
+  const receivedProviders = new Set();
+  const timeout = strict ? setTimeout(() => completed.reject(new Error(`Diagnostics timed out after ${timeoutMs}ms for ${editor.uri}`)), timeoutMs) : undefined;
   port1.onmessage = event => {
     const previousCommit = commitQueue;
     commitQueue = (async () => {
       await previousCommit;
       try {
+        if (finished) {
+          return;
+        }
         const message = event.data;
         if (requestGenerations.get(editor.id) !== generation) {
+          if (strict) {
+            throw new Error('Diagnostics request was superseded');
+          }
           if (message.type === 'done') {
             port1.close();
             completed.resolve();
@@ -6477,61 +6499,87 @@ const updateDiagnostics = async editor => {
               providers.delete(providerId);
             }
           }
+          if (requestGenerations.get(editor.id) === generation) {
+            saveProviderResults(editor, providers);
+          }
           return;
         }
         if (message.type === 'result' && message.providerId !== undefined) {
+          if (strict && message.error !== undefined) {
+            throw new Error(`Diagnostic provider ${message.providerId} failed: ${message.error}`);
+          }
+          receivedProviders.add(message.providerId);
           providers.set(message.providerId, {
             diagnostics: message.diagnostics ?? [],
             providerIndex: message.providerIndex ?? providers.size
           });
-          await commitDiagnostics(editor, generation, flattenProviderDiagnostics(providers));
+          await commitDiagnostics(editor, generation, flattenProviderDiagnostics(providers), () => saveProviderResults(editor, providers));
           return;
         }
         if (message.type === 'done') {
+          if (strict && (providerCount < 0 || receivedProviders.size !== providerCount)) {
+            throw new Error('Diagnostics stream ended without all provider results');
+          }
           if (providerCount === 0) {
             providers.clear();
-            await commitDiagnostics(editor, generation, []);
+            await commitDiagnostics(editor, generation, [], () => saveProviderResults(editor, providers));
+          }
+          if (requestGenerations.get(editor.id) === generation) {
+            saveProviderResults(editor, providers);
           }
-          previousProviderResults.set(editor.id, {
-            languageId: editor.languageId,
-            lines: editor.lines,
-            providers: new Map(providers),
-            uri: editor.uri
-          });
           port1.close();
           completed.resolve();
         }
       } catch (error) {
         port1.close();
-        completed.resolve();
-        await handleError(error, editor);
+        if (strict) {
+          completed.reject(error);
+        } else {
+          completed.resolve();
+          await handleError(error, editor);
+        }
       }
     })();
   };
   port1.start();
-  try {
+  const request = async () => {
     const response = await getDiagnostics$1(editor, port2);
+    if (finished) {
+      return;
+    }
     if (Array.isArray(response) && providerCount === -1) {
+      if (strict) {
+        throw new Error('Diagnostic provider does not support completion and error reporting');
+      }
       providers.set('legacy', {
         diagnostics: response,
         providerIndex: 0
       });
-      await commitDiagnostics(editor, generation, response);
-      previousProviderResults.set(editor.id, {
-        languageId: editor.languageId,
-        lines: editor.lines,
-        providers: new Map(providers),
-        uri: editor.uri
-      });
+      await commitDiagnostics(editor, generation, response, () => saveProviderResults(editor, providers));
       port1.close();
       completed.resolve();
     }
-    await completed.promise;
+  };
+  try {
+    await Promise.all([request(), completed.promise]);
     const latest = get$8(editor.id);
+    if (strict && !isApplicable(latest, editor, generation)) {
+      throw new Error('Editor changed or closed while waiting for diagnostics');
+    }
     return isApplicable(latest, editor, generation) ? latest.newState : editor;
   } catch (error) {
-    port1.close();
+    if (strict) {
+      if (requestGenerations.get(editor.id) === generation) {
+        requestGenerations.set(editor.id, generation + 1);
+      }
+      throw error;
+    }
     return handleError(error, editor);
+  } finally {
+    finished = true;
+    clearTimeout(timeout);
+    port1.close();
+    port2.close();
   }
 };
 const requestDiagnostics = editor => {
@@ -6552,6 +6600,18 @@ const updateDiagnosticsAll = async () => {
   }
 };
 
+// Do not wrap this command in EditorCommandQueue: streamed results need that queue to commit.
+const waitForDiagnostics = async (editorId, timeoutMs = 30_000) => {
+  if (!Number.isFinite(timeoutMs) || timeoutMs <= 0 || timeoutMs > 300_000) {
+    throw new Error('Diagnostics timeout must be between 1 and 300000ms');
+  }
+  const editor = get$8(editorId)?.newState;
+  if (!editor || editor.initial) {
+    throw new Error(`Editor is not ready: ${editorId}`);
+  }
+  await updateDiagnostics(editor, timeoutMs);
+};
+
 const disposeEditor = async editorUid => {
   const editor = get$8(editorUid)?.newState;
   if (!editor) {
@@ -10384,12 +10444,14 @@ const getEditorHoverInfo = async (editorUid, position) => {
   const wordPart = getWordBefore(editor, rowIndex, columnIndex);
   const wordStart = columnIndex - wordPart.length;
   const documentationHeight = documentation ? await measureTextBlockHeight(documentation, hoverDocumentationFontFamily, hoverDocumentationFontSize, hoverDocumentationLineHeight, hoverDocumentationWidth) : 0;
+  const measuredDisplayStringHeight = displayString ? await measureTextBlockHeight(displayString, editor.fontFamily, editor.fontSize, `${editor.rowHeight}px`, hoverDocumentationWidth) : 0;
+  const displayStringHeight = displayString ? measuredDisplayStringHeight + (measuredDisplayStringHeight > editor.rowHeight ? editor.rowHeight : 0) + 12 : 0;
   let diagnosticText = '';
   for (const diagnostic of matchingDiagnostics) {
     diagnosticText += `${diagnosticText ? '\n' : ''}${diagnostic.message} ${diagnostic.source} (${diagnostic.code})`;
   }
   const diagnosticsHeight = diagnosticText ? (await measureTextBlockHeight(diagnosticText, editor.fontFamily, editor.fontSize, `${editor.rowHeight}px`, hoverDocumentationWidth)) + 10 : 0;
-  const height = Math.min(diagnosticsHeight + (lineInfos.length > 0 ? lineInfos.length * editor.rowHeight + 12 : 0) + (documentation ? documentationHeight + 11 : 0) || 20, editor.height);
+  const height = Math.min(diagnosticsHeight + displayStringHeight + (documentation ? documentationHeight + 11 : 0) || 20, editor.height);
   const x$1 = Math.max(editor.x, Math.min(x(editor, rowIndex, wordStart), editor.x + editor.width - hoverWidth));
   const rowBottom = y(editor, rowIndex);
   const y$1 = rowBottom + height <= editor.y + editor.height ? rowBottom : Math.max(editor.y, rowBottom - editor.rowHeight - height);
@@ -18259,6 +18321,7 @@ const commandMap = {
   'Editor.updateDebugInfo': updateDebugInfo,
   'Editor.updateDiagnostics': wrapCommand(requestDiagnostics),
   'Editor.updateDiagnosticsAll': updateDiagnosticsAll,
+  'Editor.waitForDiagnostics': waitForDiagnostics,
   'EditorCompletion.close': close$3,
   'EditorCompletion.closeDetails': closeDetails$1,
   'EditorCompletion.focusFirst': focusFirst$1,

package/package.json

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