@lvce-editor/editor-worker 19.24.0 → 19.25.0

package/dist/editorWorkerMain.js

@@ -4473,207 +4473,6 @@ const get$2 = async key => {
   return value;
 };
 
-const logError = async (error, prefix) => {
-  const prettyError = await invoke$g('Errors.prepare', error);
-  await invoke$g('Errors.print', prettyError, prefix);
-};
-const logFallback = (error, prefix) => {
-  if (prefix) {
-    console.error(prefix, error);
-    return;
-  }
-  console.error(error);
-};
-const handleError$1 = async (error, prefix = '') => {
-  try {
-    await logError(error, prefix);
-  } catch (otherError) {
-    console.warn('ErrorHandling error', otherError);
-    logFallback(error, prefix);
-  }
-};
-
-const OnDiagnostic = 'onDiagnostic';
-const OnHover = 'onHover';
-const OnTabCompletion = 'onTabCompletion';
-
-const execute = async ({
-  args,
-  assetDir,
-  editor,
-  event,
-  method,
-  noProviderFoundMessage,
-  noProviderFoundResult = undefined,
-  platform
-}) => {
-  const fullEvent = `${event}:${editor.languageId}`;
-  await activateByEvent(fullEvent, assetDir, platform);
-  const result = await invoke$6(method, editor.uid, ...args);
-  return result;
-};
-
-const getTextDocument$1 = editor => {
-  return {
-    documentId: editor.id || editor.uid,
-    languageId: editor.languageId,
-    text: getText$1(editor),
-    uri: editor.uri
-  };
-};
-const executeIsolatedDiagnosticProvider = async editor => {
-  const textDocument = getTextDocument$1(editor);
-  return invoke$e('Extensions.executeDiagnosticProvider', textDocument);
-};
-const executeDiagnosticProvider = async editor => {
-  const isolatedDiagnostics = await executeIsolatedDiagnosticProvider(editor);
-  if (isolatedDiagnostics.length > 0) {
-    return isolatedDiagnostics;
-  }
-  const {
-    assetDir,
-    platform
-  } = editor;
-  return execute({
-    args: [],
-    assetDir,
-    editor,
-    event: OnDiagnostic,
-    method: 'ExtensionHost.executeDiagnosticProvider',
-    noProviderFoundMessage: 'no diagnostic provider found',
-    platform
-  });
-};
-
-const getDiagnosticType = diagnostic => {
-  return diagnostic.type;
-};
-
-const getY = (row, minLineY, rowHeight) => {
-  return (row - minLineY) * rowHeight;
-};
-
-const getVisibleDiagnostics = async (editor, diagnostics) => {
-  const visibleDiagnostics = [];
-  const {
-    charWidth,
-    fontFamily,
-    fontSize,
-    fontWeight,
-    isMonospaceFont,
-    letterSpacing,
-    lines,
-    minLineY,
-    rowHeight,
-    tabSize,
-    width
-  } = editor;
-  for (const diagnostic of diagnostics) {
-    const {
-      columnIndex,
-      endColumnIndex,
-      rowIndex
-    } = diagnostic;
-    const columnDelta = endColumnIndex - columnIndex;
-    const diagnosticWidth = columnDelta * charWidth;
-    const endLineDifference = 0;
-    const halfCursorWidth = 0;
-    const x = await getX(lines[rowIndex], columnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, charWidth, endLineDifference);
-    const y = getY(rowIndex, minLineY, rowHeight) - rowHeight;
-    visibleDiagnostics.push({
-      height: rowHeight,
-      type: getDiagnosticType(diagnostic),
-      width: diagnosticWidth,
-      x,
-      y
-    });
-  }
-  return visibleDiagnostics;
-};
-
-/**
- * Merges link decorations with diagnostic decorations
- * Links should always be present, but we also need to include any diagnostic decorations
- */
-const mergeLinksWithDiagnosticDecorations = (editor, diagnosticDecorations) => {
-  // Get link decorations
-  const linkDecorations = detectAllLinksAsDecorations(editor);
-
-  // Merge with diagnostic decorations
-  const allDecorations = [...linkDecorations, ...diagnosticDecorations];
-
-  // Sort by offset to maintain proper order
-  const sortedDecorations = [];
-  for (let i = 0; i < allDecorations.length; i += 4) {
-    sortedDecorations.push({
-      length: allDecorations[i + 1],
-      modifiers: allDecorations[i + 3],
-      offset: allDecorations[i],
-      type: allDecorations[i + 2]
-    });
-  }
-  sortedDecorations.sort((a, b) => a.offset - b.offset);
-
-  // Flatten back to array format
-  const result = [];
-  for (const dec of sortedDecorations) {
-    result.push(dec.offset, dec.length, dec.type, dec.modifiers);
-  }
-  return result;
-};
-
-const getDiagnostics$2 = async editor => {
-  const content = getText$1(editor);
-  // @ts-ignore
-  await invoke$6(TextDocumentSyncFull, editor.uri, editor.id, editor.languageId, content);
-  return executeDiagnosticProvider(editor);
-};
-const addDiagnostics = async (editor, diagnostics) => {
-  const visualDecorations = await getVisibleDiagnostics(editor, diagnostics);
-  const diagnosticDecorations = visualDecorations.flatMap(decoration => [decoration.offset, decoration.length, decoration.type, decoration.modifiers || 0]);
-  const decorations = mergeLinksWithDiagnosticDecorations(editor, diagnosticDecorations);
-  return {
-    ...editor,
-    decorations,
-    diagnostics,
-    visualDecorations
-  };
-};
-const handleError = async (error, editor) => {
-  if (error instanceof Error && error.message.includes('No diagnostic provider found')) {
-    return editor;
-  }
-  await handleError$1(error, 'Failed to update diagnostics: ');
-  return editor;
-};
-const getEditorWithDiagnostics = async editor => {
-  try {
-    const diagnostics = await getDiagnostics$2(editor);
-    if (!get$7(editor.id)) {
-      return editor;
-    }
-    return addDiagnostics(editor, diagnostics);
-  } catch (error) {
-    return handleError(error, editor);
-  }
-};
-const updateDiagnostics = async editor => {
-  try {
-    const diagnostics = await getDiagnostics$2(editor);
-    const latest = get$7(editor.id);
-    if (!latest) {
-      return editor;
-    }
-    const newEditor = await addDiagnostics(latest.newState, diagnostics);
-    set$9(editor.id, latest.oldState, newEditor);
-    // @ts-ignore
-    await invoke$b('Editor.rerender', editor.id);
-    return newEditor;
-  } catch (error) {
-    return handleError(error, editor);
-  }
-};
-
 const createEditor = async ({
   assetDir,
   columnToReveal,
@@ -4832,11 +4631,10 @@ const createEditor = async ({
   // e.g. it might not always be necessary to send text to extension host worker
   // @ts-ignore
   await invoke$6(TextDocumentSyncFull, uri, id, languageId, content);
-  const editorWithDiagnostics = diagnosticsEnabled ? await updateDiagnostics(newEditor4) : newEditor4;
   const completionsOnTypeRaw = await get$2('editor.completionsOnType');
   const completionsOnType = Boolean(completionsOnTypeRaw);
   set$9(id, emptyEditor, {
-    ...editorWithDiagnostics,
+    ...newEditor4,
     completionsOnType
   });
 };
@@ -5157,6 +4955,26 @@ const closeWidgetsMaybe = widgets => {
   return widgets.filter(widget => isPersistentWidget(widget.id));
 };
 
+const logError = async (error, prefix) => {
+  const prettyError = await invoke$g('Errors.prepare', error);
+  await invoke$g('Errors.print', prettyError, prefix);
+};
+const logFallback = (error, prefix) => {
+  if (prefix) {
+    console.error(prefix, error);
+    return;
+  }
+  console.error(error);
+};
+const handleError$1 = async (error, prefix = '') => {
+  try {
+    await logError(error, prefix);
+  } catch (otherError) {
+    console.warn('ErrorHandling error', otherError);
+    logFallback(error, prefix);
+  }
+};
+
 const getFormattingEdits = async editor => {
   const textDocument = {
     documentId: editor.id || editor.uid,
@@ -8914,6 +8732,22 @@ const openRename = async editor => {
   };
 };
 
+const execute = async ({
+  args,
+  assetDir,
+  editor,
+  event,
+  method,
+  noProviderFoundMessage,
+  noProviderFoundResult = undefined,
+  platform
+}) => {
+  const fullEvent = `${event}:${editor.languageId}`;
+  await activateByEvent(fullEvent, assetDir, platform);
+  const result = await invoke$6(method, editor.uid, ...args);
+  return result;
+};
+
 const getOrganizeImportEdits = async editor => {
   const edits = await execute({
     args: [],
@@ -9692,6 +9526,10 @@ const sortLinesAscending = editor => {
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
+const OnDiagnostic = 'onDiagnostic';
+const OnHover = 'onHover';
+const OnTabCompletion = 'onTabCompletion';
+
 const executeTabCompletionProvider = async (editor, offset) => {
   return execute({
     args: [offset],
@@ -10504,7 +10342,7 @@ const EditorCompletionWidget = {
   toggleDetails: toggleDetails$1
 };
 
-const getTextDocument = editor => {
+const getTextDocument$1 = editor => {
   return {
     documentId: editor.id || editor.uid,
     languageId: editor.languageId,
@@ -10513,7 +10351,7 @@ const getTextDocument = editor => {
   };
 };
 const executeIsolatedHoverProvider = async (editor, offset) => {
-  const textDocument = getTextDocument(editor);
+  const textDocument = getTextDocument$1(editor);
   return invoke$e('Extensions.executeHoverProvider', textDocument, offset);
 };
 const executeHoverProvider = async (editor, offset) => {
@@ -11186,7 +11024,7 @@ const getSourceActions = async editorUid => {
   const actions = await getEditorSourceActions(editorUid);
   return actions;
 };
-const getDiagnostics$1 = async editorUid => {
+const getDiagnostics$2 = async editorUid => {
   const editor = getEditor(editorUid);
   const {
     diagnostics
@@ -11674,7 +11512,39 @@ const getMenuIds = () => {
   return [Editor$1];
 };
 
-const getDiagnostics = editor => {
+const getTextDocument = editor => {
+  return {
+    documentId: editor.id || editor.uid,
+    languageId: editor.languageId,
+    text: getText$1(editor),
+    uri: editor.uri
+  };
+};
+const executeIsolatedDiagnosticProvider = async editor => {
+  const textDocument = getTextDocument(editor);
+  return invoke$e('Extensions.executeDiagnosticProvider', textDocument);
+};
+const executeDiagnosticProvider = async editor => {
+  const isolatedDiagnostics = await executeIsolatedDiagnosticProvider(editor);
+  if (isolatedDiagnostics.length > 0) {
+    return isolatedDiagnostics;
+  }
+  const {
+    assetDir,
+    platform
+  } = editor;
+  return execute({
+    args: [],
+    assetDir,
+    editor,
+    event: OnDiagnostic,
+    method: 'ExtensionHost.executeDiagnosticProvider',
+    noProviderFoundMessage: 'no diagnostic provider found',
+    platform
+  });
+};
+
+const getDiagnostics$1 = editor => {
   return executeDiagnosticProvider(editor);
 };
 const getProblems = async () => {
@@ -11687,7 +11557,7 @@ const getProblems = async () => {
     return editor;
   });
   const newEditors = editors.map(editor => editor.newState);
-  const diagnostics = await Promise.all(newEditors.map(getDiagnostics));
+  const diagnostics = await Promise.all(newEditors.map(getDiagnostics$1));
   const flatDiagnostics = diagnostics.flat();
   return flatDiagnostics;
 };
@@ -12231,11 +12101,10 @@ const loadContent = async (state, savedState) => {
   // e.g. it might not always be necessary to send text to extension host worker
   // @ts-ignore
   await invoke$6(TextDocumentSyncFull, uri, id, computedLanguageId, content);
-  const editorWithDiagnostics = diagnosticsEnabled ? await getEditorWithDiagnostics(newEditor4) : newEditor4;
   const completionsOnTypeRaw = await get$2('editor.completionsOnType');
   const completionsOnType = Boolean(completionsOnTypeRaw);
   const newEditor5 = {
-    ...editorWithDiagnostics,
+    ...newEditor4,
     completionsOnType,
     initial: false
   };
@@ -13305,6 +13174,125 @@ const updateDebugInfo = async debugId => {
   await invoke$b('Editor.rerender', key);
 };
 
+const getDiagnosticType = diagnostic => {
+  return diagnostic.type;
+};
+
+const getY = (row, minLineY, rowHeight) => {
+  return (row - minLineY) * rowHeight;
+};
+
+const getVisibleDiagnostics = async (editor, diagnostics) => {
+  const visibleDiagnostics = [];
+  const {
+    charWidth,
+    fontFamily,
+    fontSize,
+    fontWeight,
+    isMonospaceFont,
+    letterSpacing,
+    lines,
+    minLineY,
+    rowHeight,
+    tabSize,
+    width
+  } = editor;
+  for (const diagnostic of diagnostics) {
+    const {
+      columnIndex,
+      endColumnIndex,
+      rowIndex
+    } = diagnostic;
+    const columnDelta = endColumnIndex - columnIndex;
+    const diagnosticWidth = columnDelta * charWidth;
+    const endLineDifference = 0;
+    const halfCursorWidth = 0;
+    const x = await getX(lines[rowIndex], columnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, charWidth, endLineDifference);
+    const y = getY(rowIndex, minLineY, rowHeight);
+    visibleDiagnostics.push({
+      height: rowHeight,
+      type: getDiagnosticType(diagnostic),
+      width: diagnosticWidth,
+      x,
+      y
+    });
+  }
+  return visibleDiagnostics;
+};
+
+/**
+ * Merges link decorations with diagnostic decorations
+ * Links should always be present, but we also need to include any diagnostic decorations
+ */
+const mergeLinksWithDiagnosticDecorations = (editor, diagnosticDecorations) => {
+  // Get link decorations
+  const linkDecorations = detectAllLinksAsDecorations(editor);
+
+  // Merge with diagnostic decorations
+  const allDecorations = [...linkDecorations, ...diagnosticDecorations];
+
+  // Sort by offset to maintain proper order
+  const sortedDecorations = [];
+  for (let i = 0; i < allDecorations.length; i += 4) {
+    sortedDecorations.push({
+      length: allDecorations[i + 1],
+      modifiers: allDecorations[i + 3],
+      offset: allDecorations[i],
+      type: allDecorations[i + 2]
+    });
+  }
+  sortedDecorations.sort((a, b) => a.offset - b.offset);
+
+  // Flatten back to array format
+  const result = [];
+  for (const dec of sortedDecorations) {
+    result.push(dec.offset, dec.length, dec.type, dec.modifiers);
+  }
+  return result;
+};
+
+const getDiagnostics = async editor => {
+  const content = getText$1(editor);
+  // @ts-ignore
+  await invoke$6(TextDocumentSyncFull, editor.uri, editor.id, editor.languageId, content);
+  return executeDiagnosticProvider(editor);
+};
+const addDiagnostics = async (editor, diagnostics) => {
+  const visualDecorations = await getVisibleDiagnostics(editor, diagnostics);
+  const diagnosticDecorations = visualDecorations.flatMap(decoration => [decoration.offset, decoration.length, decoration.type, decoration.modifiers || 0]);
+  const decorations = mergeLinksWithDiagnosticDecorations(editor, diagnosticDecorations);
+  return {
+    ...editor,
+    decorations,
+    diagnostics,
+    visualDecorations
+  };
+};
+const handleError = async (error, editor) => {
+  if (error instanceof Error && error.message.includes('No diagnostic provider found')) {
+    return editor;
+  }
+  await handleError$1(error, 'Failed to update diagnostics: ');
+  return editor;
+};
+const updateDiagnostics = async editor => {
+  if (!editor.diagnosticsEnabled) {
+    return editor;
+  }
+  try {
+    const diagnostics = await getDiagnostics(editor);
+    const latest = get$7(editor.id);
+    if (!latest) {
+      return editor;
+    }
+    const newEditor = await addDiagnostics(latest.newState, diagnostics);
+    set$9(editor.id, latest.oldState, newEditor);
+    return newEditor;
+  } catch (error) {
+    return handleError(error, editor);
+  }
+};
+
 const queues = [];
 
 // TODO wrap commands globally, not per editor
@@ -13404,7 +13392,7 @@ const commandMap = {
   'Editor.fold': wrapCommand(fold$1),
   'Editor.format': wrapCommand(format),
   'Editor.getCommandIds': getCommandIds,
-  'Editor.getDiagnostics': getDiagnostics$1,
+  'Editor.getDiagnostics': getDiagnostics$2,
   'Editor.getKeyBindings': getKeyBindings,
   'Editor.getKeys': getKeys$1,
   'Editor.getLanguageId': getLanguageId,
@@ -13511,6 +13499,7 @@ const commandMap = {
   'Editor.setDecorations': wrapCommand(setDecorations),
   'Editor.setDelta': wrapCommand(setDelta),
   'Editor.setDeltaY': wrapCommand(setDeltaY),
+  'Editor.setDiagnostics': wrapCommand(addDiagnostics),
   'Editor.setLanguageId': wrapCommand(setLanguageId),
   'Editor.setSelections': wrapCommand(setSelections),
   'Editor.setSelections2': setSelections2,

package/package.json

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