@lvce-editor/editor-worker 19.69.10 → 19.70.1

package/dist/editorWorkerMain.js

@@ -6381,7 +6381,7 @@ const diagnosticsEqual = (left, right) => {
   }
   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;
+    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.tags === diagnostic.tags || (other.tags?.length ?? 0) === (diagnostic.tags?.length ?? 0) && (other.tags ?? []).every((tag, index) => tag === diagnostic.tags?.[index])) && 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;
@@ -6438,7 +6438,11 @@ const saveProviderResults = (editor, providers) => {
     uri: editor.uri
   });
 };
-const updateDiagnostics = async editor => {
+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;
   }
@@ -6459,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();
@@ -6492,6 +6505,10 @@ const updateDiagnostics = async editor => {
           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
@@ -6500,6 +6517,9 @@ const updateDiagnostics = async editor => {
           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, [], () => saveProviderResults(editor, providers));
@@ -6512,15 +6532,25 @@ const updateDiagnostics = async editor => {
         }
       } 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
@@ -6529,12 +6559,27 @@ const updateDiagnostics = async editor => {
       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 => {
@@ -6555,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) {
@@ -13149,11 +13206,21 @@ const getSnippetChanges = (lines, selections, snippet) => {
   for (let i = 0; i < selections.length; i += 4) {
     const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn] = getSelectionPairs(selections, i);
     if (insertedLines.length > 1) {
+      let placeholderRow = -1;
+      let placeholderColumn = -1;
+      const insertedLinesWithoutPlaceholder = insertedLines.map((line, rowIndex) => {
+        const index = line.indexOf('$0');
+        if (index !== -1 && placeholderRow === -1) {
+          placeholderRow = rowIndex;
+          placeholderColumn = index;
+        }
+        return line.replace('$0', '');
+      });
       const line = getLine$1({
         lines
       }, selectionStartRow);
       const indent = getIndent(line);
-      const insertedLinesHere = [insertedLines[0], ...insertedLines.slice(1).map(line => indent + line)];
+      const insertedLinesHere = [insertedLinesWithoutPlaceholder[0], ...insertedLinesWithoutPlaceholder.slice(1).map(line => indent + line)];
       const deleted = [''];
       changes.push({
         deleted,
@@ -13169,11 +13236,17 @@ const getSnippetChanges = (lines, selections, snippet) => {
         }
       });
       const lastInsertedLine = insertedLines.at(-1);
-      selectionChanges.push(selectionEndRow + insertedLines.length - deleted.length,
-      // @ts-ignore
-      selectionEndColumn + lastInsertedLine.length, selectionEndRow + insertedLines.length - deleted.length,
-      // @ts-ignore
-      selectionEndColumn + lastInsertedLine.length);
+      if (placeholderRow === -1) {
+        selectionChanges.push(selectionEndRow + insertedLines.length - deleted.length,
+        // @ts-ignore
+        selectionEndColumn + lastInsertedLine.length, selectionEndRow + insertedLines.length - deleted.length,
+        // @ts-ignore
+        selectionEndColumn + lastInsertedLine.length);
+      } else {
+        const cursorRow = selectionStartRow + placeholderRow;
+        const cursorColumn = placeholderColumn + (placeholderRow === 0 ? selectionStartColumn - snippet.deleted : indent.length);
+        selectionChanges.push(cursorRow, cursorColumn, cursorRow, cursorColumn);
+      }
     } else {
       const line = insertedLines[0];
       const placeholderIndex = line.indexOf('$0');
@@ -16720,6 +16793,10 @@ const getEditorDiagnosticsVirtualDom = (diagnostics, bracketMatchInfos = []) =>
   }, ...diagnosticsDom, ...bracketMatchesDom];
 };
 
+const DiagnosticTag = {
+  Unnecessary: 1
+};
+
 const editorLineDecorationNode = {
   childCount: 1,
   className: EditorLineDecoration,
@@ -16735,6 +16812,49 @@ const mergeConflictActions = [{
   action: 'both',
   label: 'Accept Both Changes'
 }];
+const getUnnecessaryRanges = (diagnostics, rowIndex, textLength) => {
+  return diagnostics.filter(diagnostic => diagnostic.tags?.includes(DiagnosticTag.Unnecessary)).flatMap(diagnostic => {
+    if (rowIndex < diagnostic.rowIndex || rowIndex > diagnostic.endRowIndex) {
+      return [];
+    }
+    const start = rowIndex === diagnostic.rowIndex ? diagnostic.columnIndex : 0;
+    const end = rowIndex === diagnostic.endRowIndex ? diagnostic.endColumnIndex : textLength;
+    return start < end ? [{
+      end,
+      start
+    }] : [];
+  }).toSorted((left, right) => left.start - right.start);
+};
+const getTokenParts = (textInfos, ranges) => {
+  const parts = [];
+  let offset = 0;
+  for (let index = 0; index < textInfos.length; index += 2) {
+    const tokenText = textInfos[index];
+    const tokenClassName = textInfos[index + 1];
+    const tokenEnd = offset + tokenText.length;
+    const boundaries = new Set([offset, tokenEnd]);
+    for (const range of ranges) {
+      if (range.start > offset && range.start < tokenEnd) {
+        boundaries.add(range.start);
+      }
+      if (range.end > offset && range.end < tokenEnd) {
+        boundaries.add(range.end);
+      }
+    }
+    const sortedBoundaries = [...boundaries].toSorted((left, right) => left - right);
+    for (let boundaryIndex = 0; boundaryIndex < sortedBoundaries.length - 1; boundaryIndex++) {
+      const start = sortedBoundaries[boundaryIndex];
+      const end = sortedBoundaries[boundaryIndex + 1];
+      const unnecessary = ranges.some(range => start >= range.start && end <= range.end);
+      parts.push({
+        className: unnecessary ? mergeClassNames(tokenClassName, 'EditorTokenUnnecessary') : tokenClassName,
+        text: tokenText.slice(start - offset, end - offset)
+      });
+    }
+    offset = tokenEnd;
+  }
+  return parts;
+};
 const addMergeConflictActions = (dom, rowIndex) => {
   dom.push({
     childCount: mergeConflictActions.length,
@@ -16759,7 +16879,7 @@ const addMergeConflictActions = (dom, rowIndex) => {
     }, text(label));
   }
 };
-const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, highlightedLine = -1, visibleLineIndices = [], endOfLineDecorations = [], visibleViewLineIndices = [], problemsHighlightedRow = -1) => {
+const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, highlightedLine = -1, visibleLineIndices = [], endOfLineDecorations = [], visibleViewLineIndices = [], problemsHighlightedRow = -1, diagnostics = []) => {
   const dom = [];
   const actualViewRows = visibleViewLineIndices.length === 0 ? Array.from({
     length: textInfos.length
@@ -16774,6 +16894,11 @@ const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, h
     const difference = differences[textInfoIndex];
     const rowIndex = viewRow;
     const rowDecorations = endOfLineDecorations.filter(decoration => decoration.rowIndex === rowIndex);
+    let rowTextLength = 0;
+    for (let index = 0; index < textInfo.length; index += 2) {
+      rowTextLength += textInfo[index].length;
+    }
+    const tokenParts = getTokenParts(textInfo, getUnnecessaryRanges(diagnostics, rowIndex, rowTextLength));
     let className = EditorRow;
     if (rowIndex === highlightedLine) {
       className = mergeClassNames(className, EditorRowHighlighted);
@@ -16782,14 +16907,15 @@ const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, h
       className = mergeClassNames(className, 'EditorProblemsHighlightedRow');
     }
     dom.push({
-      childCount: textInfo.length / 2 + rowDecorations.length,
+      childCount: tokenParts.length + rowDecorations.length,
       className,
       translate: difference === 0 ? '' : px(difference),
       type: Div
     });
-    for (let j = 0; j < textInfo.length; j += 2) {
-      const tokenText = textInfo[j];
-      const className = textInfo[j + 1];
+    for (const {
+      className,
+      text: tokenText
+    } of tokenParts) {
       dom.push({
         childCount: 1,
         className,
@@ -17559,6 +17685,7 @@ const renderLines = {
       return [/* method */'setIncrementalEdits', /* incrementalEdits */incrementalEdits];
     }
     const {
+      diagnostics,
       differences,
       endOfLineDecorations,
       textInfos
@@ -17569,7 +17696,7 @@ const renderLines = {
       visibleLineIndices,
       visibleViewLineIndices
     } = newState;
-    const dom = getEditorRowsVirtualDom$1(textInfos, differences, true, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices, newState.problemsHighlightedRow);
+    const dom = getEditorRowsVirtualDom$1(textInfos, differences, true, highlightedLine, visibleLineIndices, endOfLineDecorations, visibleViewLineIndices, newState.problemsHighlightedRow, diagnostics || []);
     return [/* method */'setText', dom];
   },
   isEqual: (oldState, newState) => oldState.lines === newState.lines && oldState.foldingRanges === newState.foldingRanges && oldState.visibleViewLineIndices === newState.visibleViewLineIndices && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.endOfLineDecorations === newState.endOfLineDecorations && oldState.deltaX === newState.deltaX && oldState.width === newState.width && oldState.highlightedLine === newState.highlightedLine && oldState.problemsHighlightedRow === newState.problemsHighlightedRow && oldState.debugEnabled === newState.debugEnabled
@@ -18264,6 +18391,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.10",
+  "version": "19.70.1",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"