@lvce-editor/editor-worker 19.69.8 → 19.69.10

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,6 +6431,13 @@ const flattenProviderDiagnostics = providers => {
     diagnostics
   }) => diagnostics);
 };
+const saveProviderResults = (editor, providers) => {
+  previousProviderResults.set(editor.id, {
+    languageId: editor.languageId,
+    providers: new Map(providers),
+    uri: editor.uri
+  });
+};
 const updateDiagnostics = async editor => {
   if (!editor.diagnosticsEnabled || editor.loadError) {
     return editor;
@@ -6438,7 +6447,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);
     }
@@ -6477,6 +6486,9 @@ const updateDiagnostics = async editor => {
               providers.delete(providerId);
             }
           }
+          if (requestGenerations.get(editor.id) === generation) {
+            saveProviderResults(editor, providers);
+          }
           return;
         }
         if (message.type === 'result' && message.providerId !== undefined) {
@@ -6484,20 +6496,17 @@ const updateDiagnostics = async editor => {
             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 (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();
         }
@@ -6516,13 +6525,7 @@ const updateDiagnostics = async editor => {
         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();
     }
@@ -9329,6 +9332,7 @@ const EditorDecrementSelection = 'Editor: Decrement Selection';
 const EditorFormatDocumentForced = 'Editor: Format Document (forced)';
 const EditorGoToDefinition = 'Editor: Go To Definition';
 const EditorGoToTypeDefinition = 'Editor: Go To Type Definition';
+const EditorOrganizeImports = 'Editor: Organize Imports';
 const EditorIndent = 'Editor: Indent';
 const EditorIncrementSelection = 'Editor: Increment Selection';
 const EditorOpenColorPicker = 'Editor: Open Color Picker';
@@ -9395,6 +9399,9 @@ const noTypeDefinitionFound = () => {
 const sourceAction = () => {
   return i18nString(SourceAction);
 };
+const editorOrganizeImports = () => {
+  return i18nString(EditorOrganizeImports);
+};
 const escapeToClose = () => {
   return i18nString(EscapeToClose);
 };
@@ -10380,12 +10387,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);
@@ -15376,6 +15385,9 @@ const getQuickPickMenuEntries = () => {
   }, {
     id: 'Editor.format',
     label: formatDocument()
+  }, {
+    id: 'Editor.organizeImports',
+    label: editorOrganizeImports()
   }, {
     id: 'Editor.showHover',
     label: editorShowHover()

package/package.json

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