@lvce-editor/editor-worker 19.23.0 → 19.24.1

package/dist/editorWorkerMain.js

@@ -1445,7 +1445,7 @@ const create$9 = rpcId => {
 };
 
 const Audio = 0;
-const Button$1 = 1;
+const Button$2 = 1;
 const Col = 2;
 const ColGroup = 3;
 const Div$1 = 4;
@@ -1498,7 +1498,7 @@ const Video = 61;
 const TextArea$1 = 62;
 const Select = 63;
 const Option = 64;
-const Code = 65;
+const Code$1 = 65;
 const Label = 66;
 const Dt = 67;
 const Iframe = 68;
@@ -1536,11 +1536,11 @@ const VirtualDomElements = {
   Audio,
   BlockQuote,
   Br,
-  Button: Button$1,
+  Button: Button$2,
   Canvas,
   Circle,
   Cite,
-  Code,
+  Code: Code$1,
   Col,
   ColGroup,
   Data,
@@ -1614,7 +1614,7 @@ const VirtualDomElements = {
 };
 
 const AltKey = 'event.altKey';
-const Button = 'event.button';
+const Button$1 = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
 const DeltaMode = 'event.deltaMode';
@@ -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) => {
@@ -10790,6 +10628,10 @@ const getLineInfosVirtualDom = lineInfos => {
   return dom;
 };
 
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
 const hoverProblemMessage = {
   childCount: 1,
   className: HoverProblemMessage,
@@ -10800,6 +10642,11 @@ const hoverProblemDetail = {
   className: HoverProblemDetail,
   type: Span
 };
+const hoverDocumentationNode = {
+  childCount: 1,
+  className: HoverDocumentation,
+  type: Div
+};
 const getChildCount = (lineInfos, documentation, diagnostics) => {
   const documentationCount = documentation ? 1 : 0;
   const diagnosticsCount = diagnostics && diagnostics.length > 0 ? 1 : 0;
@@ -10809,13 +10656,13 @@ const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
   const dom = [];
   dom.push({
     childCount: getChildCount(lineInfos, documentation, diagnostics) + 1,
-    className: 'Viewlet EditorHover',
+    className: mergeClassNames('Viewlet', 'EditorHover'),
     type: Div
   });
   if (diagnostics && diagnostics.length > 0) {
     dom.push({
       childCount: diagnostics.length * 2,
-      className: `${HoverDisplayString} ${HoverProblem}`,
+      className: mergeClassNames(HoverDisplayString, HoverProblem),
       type: Div
     });
     for (const diagnostic of diagnostics) {
@@ -10831,15 +10678,11 @@ const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
     }, ...lineInfosDom);
   }
   if (documentation) {
-    dom.push({
-      childCount: 1,
-      className: HoverDocumentation,
-      type: Div
-    }, text(documentation));
+    dom.push(hoverDocumentationNode, text(documentation));
   }
   dom.push({
     childCount: 0,
-    className: 'Sash SashVertical SashResize',
+    className: mergeClassNames('Sash', 'SashVertical', 'SashResize'),
     onPointerDown: HandleSashPointerDown,
     type: Div
   });
@@ -11181,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
@@ -11669,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 () => {
@@ -11682,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;
 };
@@ -12226,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
   };
@@ -12634,33 +12508,41 @@ const diffTree = (oldNodes, newNodes) => {
   return removeTrailingNavigationPatches(patches);
 };
 
+const Button = 'button';
+const Code = 'code';
+const TextBox = 'textbox';
+
+const True = 'true';
+
+const editorInputNode = {
+  childCount: 1,
+  className: 'EditorInput',
+  type: Div
+};
+const editorTextAreaNode = {
+  ariaAutoComplete: 'list',
+  ariaMultiLine: True,
+  ariaRoleDescription: 'editor',
+  autocapitalize: 'off',
+  autocomplete: 'off',
+  autocorrect: 'off',
+  childCount: 0,
+  name: 'editor',
+  onBeforeInput: HandleBeforeInput,
+  onBlur: HandleBlur,
+  onCompositionEnd: HandleCompositionEnd,
+  onCompositionStart: HandleCompositionStart,
+  onCompositionUpdate: HandleCompositionUpdate,
+  onCut: HandleCut,
+  onFocus: HandleFocus,
+  onPaste: HandlePaste,
+  role: TextBox,
+  spellcheck: false,
+  type: TextArea,
+  wrap: 'off'
+};
 const getEditorInputVirtualDom = () => {
-  return [{
-    childCount: 1,
-    className: 'EditorInput',
-    type: Div
-  }, {
-    ariaAutoComplete: 'list',
-    ariaMultiLine: 'true',
-    ariaRoleDescription: 'editor',
-    autocapitalize: 'off',
-    autocomplete: 'off',
-    autocorrect: 'off',
-    childCount: 0,
-    name: 'editor',
-    onBeforeInput: HandleBeforeInput,
-    onBlur: HandleBlur,
-    onCompositionEnd: HandleCompositionEnd,
-    onCompositionStart: HandleCompositionStart,
-    onCompositionUpdate: HandleCompositionUpdate,
-    onCut: HandleCut,
-    onFocus: HandleFocus,
-    onPaste: HandlePaste,
-    role: 'textbox',
-    spellcheck: false,
-    type: TextArea,
-    wrap: 'off'
-  }];
+  return [editorInputNode, editorTextAreaNode];
 };
 
 const getCursorsVirtualDom = cursors => {
@@ -12697,10 +12579,6 @@ const getDiagnosticClassName = type => {
   }
 };
 
-const mergeClassNames = (...classNames) => {
-  return classNames.filter(Boolean).join(' ');
-};
-
 const getDiagnosticVirtualDom = diagnostic => {
   const {
     height,
@@ -12742,7 +12620,7 @@ const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, h
     const difference = differences[i];
     let className = EditorRow;
     if (i === highlightedLine) {
-      className += ' ' + EditorRowHighlighted;
+      className = mergeClassNames(className, EditorRowHighlighted);
     }
     dom.push({
       childCount: textInfo.length / 2,
@@ -12803,12 +12681,13 @@ const getEditorSelectionsVirtualDom = selectionInfos => {
   }, ...selectionsDom];
 };
 
+const editorLayersNode = {
+  childCount: 4,
+  className: 'EditorLayers',
+  type: Div
+};
 const getEditorLayersVirtualDom = (selectionInfos, textInfos, differences, lineNumbers = true, highlightedLine = -1, cursorInfos = [], diagnostics = []) => {
-  return [{
-    childCount: 4,
-    className: 'EditorLayers',
-    type: Div
-  }, ...getEditorSelectionsVirtualDom(selectionInfos), ...getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine), ...getEditorCursorsVirtualDom(cursorInfos), ...getEditorDiagnosticsVirtualDom(diagnostics)];
+  return [editorLayersNode, ...getEditorSelectionsVirtualDom(selectionInfos), ...getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine), ...getEditorCursorsVirtualDom(cursorInfos), ...getEditorDiagnosticsVirtualDom(diagnostics)];
 };
 
 const getEditorScrollBarDiagnosticsVirtualDom = scrollBarDiagnostics => {
@@ -12822,26 +12701,34 @@ const getEditorScrollBarDiagnosticsVirtualDom = scrollBarDiagnostics => {
 const getScrollBarVirtualDom = () => {
   return [{
     childCount: 1,
-    className: 'ScrollBar ScrollBarVertical',
+    className: mergeClassNames('ScrollBar', 'ScrollBarVertical'),
     onContextMenu: HandleContextMenu,
     onPointerDown: HandleScrollBarVerticalPointerDown,
     type: Div
   }, {
     childCount: 0,
-    className: 'ScrollBarThumb ScrollBarThumbVertical',
+    className: mergeClassNames('ScrollBarThumb', 'ScrollBarThumbVertical'),
     type: Div
   }, {
     childCount: 1,
-    className: 'ScrollBar ScrollBarHorizontal',
+    className: mergeClassNames('ScrollBar', 'ScrollBarHorizontal'),
     onPointerDown: HandleScrollBarHorizontalPointerDown,
     type: Div
   }, {
     childCount: 0,
-    className: 'ScrollBarThumb ScrollBarThumbHorizontal',
+    className: mergeClassNames('ScrollBarThumb', 'ScrollBarThumbHorizontal'),
     type: Div
   }];
 };
 
+const editorContentNode = {
+  childCount: 5,
+  className: 'EditorContent',
+  onKeyUp: HandleKeyUp,
+  onMouseMove: HandleMouseMove,
+  onWheel: HandleWheel,
+  type: Div
+};
 const getEditorContentVirtualDom = ({
   cursorInfos = [],
   diagnostics = [],
@@ -12852,14 +12739,7 @@ const getEditorContentVirtualDom = ({
   selectionInfos = [],
   textInfos
 }) => {
-  return [{
-    childCount: 5,
-    className: 'EditorContent',
-    onKeyUp: HandleKeyUp,
-    onMouseMove: HandleMouseMove,
-    onWheel: HandleWheel,
-    type: Div
-  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom()];
+  return [editorContentNode, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom()];
 };
 
 const getGutterInfoVirtualDom = gutterInfo => {
@@ -12906,6 +12786,11 @@ const getGutterInfos = (minLineY, maxLineY, breakPoints, showLineNumbers = true,
   return gutterInfos;
 };
 
+const textEditorErrorMessageNode = {
+  childCount: 1,
+  className: 'TextEditorErrorMessage',
+  type: Div
+};
 const getEditorVirtualDom = ({
   breakPoints = [],
   cursorInfos = [],
@@ -12926,29 +12811,25 @@ const getEditorVirtualDom = ({
   if (loadError) {
     return [{
       childCount: 2,
-      className: 'Viewlet TextEditorError',
+      className: mergeClassNames('Viewlet', 'TextEditorError'),
       'data-uid': uid,
-      role: 'code',
+      role: Code,
       type: Div
     }, {
       childCount: 0,
-      className: 'EditorTextIcon EditorTextIconError MaskIcon MaskIconError',
-      type: Div
-    }, {
-      childCount: 1,
-      className: 'TextEditorErrorMessage',
+      className: mergeClassNames('EditorTextIcon', 'EditorTextIconError', 'MaskIcon', 'MaskIconError'),
       type: Div
-    }, text(loadError)];
+    }, textEditorErrorMessageNode, text(loadError)];
   }
   const visibleGutterInfos = breakPoints.length > 0 || visibleLineIndices ? getGutterInfos(minLineY, maxLineY, breakPoints, lineNumbers, visibleLineIndices) : gutterInfos;
   const showGutter = lineNumbers || breakPoints.length > 0;
   const gutterDom = showGutter ? getEditorGutterVirtualDom(visibleGutterInfos) : [];
   return [{
     childCount: showGutter ? 2 : 1,
-    className: 'Viewlet Editor',
+    className: mergeClassNames('Viewlet', 'Editor'),
     'data-uid': uid,
     onContextMenu: HandleContextMenu,
-    role: 'code',
+    role: Code,
     type: Div
   }, ...gutterDom, ...getEditorContentVirtualDom({
     cursorInfos,
@@ -13201,7 +13082,7 @@ const renderEventListeners = () => {
     passive: true
   }, {
     name: HandleContextMenu,
-    params: ['handleContextMenu', Button, ClientX, ClientY],
+    params: ['handleContextMenu', Button$1, ClientX, ClientY],
     preventDefault: true
   }, {
     name: HandleScrollBarVerticalPointerDown,
@@ -13293,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
@@ -13392,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,
@@ -13499,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,
@@ -13686,6 +13687,11 @@ const listen = async () => {
 
 const CodeGeneratorInput = 'CodeGeneratorInput';
 
+const codeGeneratorMessageNode = {
+  childCount: 1,
+  className: CodeGeneratorMessage,
+  type: Div
+};
 const getCodeGeneratorVirtualDom = state => {
   const escapeToClose$1 = escapeToClose();
   const enterCode$1 = enterCode();
@@ -13699,11 +13705,7 @@ const getCodeGeneratorVirtualDom = state => {
     name: CodeGeneratorInput,
     placeholder: enterCode$1,
     type: Input
-  }, {
-    childCount: 1,
-    className: CodeGeneratorMessage,
-    type: Div
-  }, text(escapeToClose$1)];
+  }, codeGeneratorMessageNode, text(escapeToClose$1)];
 };
 
 const renderContent$1 = {
@@ -13805,23 +13807,29 @@ const EditorColorPickerWidget = {
   render: render$4
 };
 
+const Focusable = 0;
+
+const completionDetailContentNode = {
+  childCount: 1,
+  className: CompletionDetailContent,
+  type: Div
+};
+const completionDetailCloseButtonNode = {
+  childCount: 1,
+  className: CompletionDetailCloseButton,
+  onClick: HandleClose,
+  role: Button,
+  tabIndex: Focusable,
+  type: Div
+};
 const getCompletionDetailVirtualDom = content => {
   const dom = [{
     childCount: 2,
-    className: 'Viewlet EditorCompletionDetails',
+    className: mergeClassNames('Viewlet', 'EditorCompletionDetails'),
     type: Div
-  }, {
-    childCount: 1,
-    className: CompletionDetailContent,
-    type: Div
-  }, text(content), {
-    childCount: 1,
-    className: CompletionDetailCloseButton,
-    onClick: HandleClose,
-    type: Div
-  }, {
+  }, completionDetailContentNode, text(content), completionDetailCloseButtonNode, {
     childCount: 0,
-    className: `${MaskIcon} ${IconClose}`,
+    className: mergeClassNames(MaskIcon, IconClose),
     type: Div
   }];
   return dom;
@@ -13969,7 +13977,7 @@ const render = widget => {
   } = widget.newState;
   const dom = [{
     childCount: 1,
-    className: 'Viewlet EditorMessage EditorMessageText EditorOverlayMessage',
+    className: mergeClassNames('Viewlet', 'EditorMessage', 'EditorMessageText', 'EditorOverlayMessage'),
     style: `left:${x}px;top:${y}px;`,
     type: Div
   }, text(message)];

package/package.json

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