@lvce-editor/editor-worker 5.1.0 → 5.3.0

package/dist/editorWorkerMain.js

@@ -18,6 +18,11 @@ const execute$1 = (command, ...args) => {
   return fn(...args);
 };
 
+const codeGeneratorAccept = state => {
+  // TODO close code generator widget
+  return state;
+};
+
 let AssertionError$1 = class AssertionError extends Error {
   constructor(message) {
     super(message);
@@ -1034,6 +1039,13 @@ const set$6 = (id, oldEditor, newEditor) => {
   };
 };
 
+const CompletionExecute = 'ExtensionHostCompletion.execute';
+const CompletionResolveExecute = 'ExtensionHostCompletion.executeResolve';
+const HoverExecute = 'ExtensionHostHover.execute';
+const RenameExecuteRename = 'ExtensionHostRename.executeRenameProvider';
+const TabCompletionExecuteTabCompletionProvider = 'ExtensionHost.executeTabCompletionProvider';
+const TextDocumentSyncFull = 'ExtensionHostTextDocument.syncFull';
+
 const Two = '2.0';
 class AssertionError extends Error {
   constructor(message) {
@@ -1718,13 +1730,6 @@ const {
   invoke: invoke$2
 } = createRpc(ExtensionHostWorker);
 
-const CompletionExecute = 'ExtensionHostCompletion.execute';
-const CompletionResolveExecute = 'ExtensionHostCompletion.executeResolve';
-const HoverExecute = 'ExtensionHostHover.execute';
-const RenameExecuteRename = 'ExtensionHostRename.executeRenameProvider';
-const TabCompletionExecuteTabCompletionProvider = 'ExtensionHost.executeTabCompletionProvider';
-const TextDocumentSyncFull = 'ExtensionHostTextDocument.syncFull';
-
 const ColorPicker$2 = 41;
 const CompletionDetail$1 = 999;
 const EditorCompletion = 9;
@@ -1746,6 +1751,123 @@ const measureCharacterWidth = (fontWeight, fontSize, fontFamily, letterSpacing)
   return measureTextWidth('a', fontWeight, fontSize, fontFamily, letterSpacing, false, 0);
 };
 
+const OnRename = 'onRename';
+const OnCompletion = 'onCompletion';
+const OnDiagnostic = 'onDiagnostic';
+const OnHover = 'onHover';
+const OnTabCompletion = 'onTabCompletion';
+
+// TODO add tests for this
+const activateByEvent = async event => {
+  await invoke$3('ExtensionHostManagement.activateByEvent', event);
+};
+
+const execute = async ({
+  editor,
+  args,
+  event,
+  method,
+  noProviderFoundMessage,
+  noProviderFoundResult = undefined
+}) => {
+  const fullEvent = `${event}:${editor.languageId}`;
+  await activateByEvent(fullEvent);
+  const result = await invoke$2(method, editor.uid, ...args);
+  return result;
+};
+
+const combineResults$3 = results => {
+  return results[0];
+};
+const executeDiagnosticProvider = editor => {
+  return execute({
+    editor,
+    event: OnDiagnostic,
+    method: 'ExtensionHost.executeDiagnosticProvider',
+    args: [],
+    noProviderFoundMessage: 'no diagnostic provider found',
+    noProviderResult: [],
+    combineResults: combineResults$3
+  });
+};
+
+const getDiagnosticType = diagnostic => {
+  return diagnostic.type;
+};
+
+const getVisibleDiagnostics = (editor, diagnostics) => {
+  const visibleDiagnostics = [];
+  const {
+    width,
+    rowHeight,
+    minLineY,
+    charWidth,
+    letterSpacing,
+    lines,
+    fontWeight,
+    fontSize,
+    fontFamily,
+    isMonospaceFont,
+    tabSize
+  } = editor;
+  for (const diagnostic of diagnostics) {
+    const {
+      rowIndex,
+      columnIndex,
+      endColumnIndex
+    } = diagnostic;
+    const columnDelta = endColumnIndex - columnIndex;
+    const diagnosticWidth = columnDelta * charWidth;
+    const endLineDifference = 0;
+    const halfCursorWidth = 0;
+    const x = getX(lines[rowIndex], columnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, charWidth, endLineDifference);
+    const y = getY(rowIndex, minLineY, rowHeight);
+    visibleDiagnostics.push({
+      x,
+      y,
+      width: diagnosticWidth,
+      height: rowHeight,
+      type: getDiagnosticType(diagnostic)
+    });
+  }
+  return visibleDiagnostics;
+};
+
+const updateDiagnostics = async uid => {
+  try {
+    // TODO handle error
+    // TODO handle race condition
+    const {
+      newState
+    } = get$6(uid);
+
+    // TODO sync textdocument incrementally
+    // TODO sync and ask for diagnostics at the same time?
+    // TODO throttle diagnostics
+    const content = getText$1(newState);
+    await invoke$2(TextDocumentSyncFull, newState.uri, newState.id, newState.languageId, content);
+    const diagnostics = await executeDiagnosticProvider(newState);
+    const latest = get$6(uid);
+    if (!latest) {
+      return;
+    }
+    const decorations = getVisibleDiagnostics(latest.newState, diagnostics);
+    const newEditor = {
+      ...latest.newState,
+      diagnostics,
+      decorations
+    };
+    set$6(uid, latest.oldState, newEditor);
+    await invoke$3('Editor.rerender', uid);
+  } catch (error) {
+    // @ts-ignore
+    if (error && error.message.includes('No diagnostic provider found')) {
+      return;
+    }
+    console.error(`Failed to update diagnostics: ${error}`);
+  }
+};
+
 const emptyEditor = {
   uri: '',
   languageId: '',
@@ -1796,7 +1918,8 @@ const createEditor = async ({
   fontWeight,
   fontFamily,
   isMonospaceFont,
-  uri
+  uri,
+  diagnosticsEnabled
 }) => {
   number$1(id);
   string(content);
@@ -1856,7 +1979,8 @@ const createEditor = async ({
     uid: id,
     id,
     widgets: [],
-    focusKey: Empty
+    focusKey: Empty,
+    diagnosticsEnabled
   };
   // TODO avoid creating intermediate editors here
   const newEditor1 = setBounds(editor, x, y, width, height, 9);
@@ -1868,6 +1992,9 @@ const createEditor = async ({
   };
   set$6(id, emptyEditor, newEditor4);
   await invoke$2(TextDocumentSyncFull, uri, id, languageId, content);
+  if (diagnosticsEnabled) {
+    updateDiagnostics(editor.uid);
+  }
 };
 
 // @ts-ignore
@@ -2260,6 +2387,16 @@ const cancelSelection = editor => {
   return scheduleSelections(editor, newSelections);
 };
 
+// TODO use numeric widget id
+const CodeGenerator = 1;
+const ColorPicker$1 = 2;
+const Completion = 3;
+const CompletionDetail = 4;
+const Find = 5;
+const Hover = 6;
+const Rename = 7;
+const SourceAction = 8;
+
 const getIndex = (widgets, id) => {
   for (const [i, widget] of widgets.entries()) {
     if (widget.id === id) {
@@ -2274,15 +2411,24 @@ const removeEditorWidget = (widgets, id) => {
   return newWidgets;
 };
 
-// TODO use numeric widget id
-const CodeGenerator = 1;
-const ColorPicker$1 = 2;
-const Completion = 3;
-const CompletionDetail = 4;
-const Find = 5;
-const Hover = 6;
-const Rename = 7;
-const SourceAction = 8;
+const isMatchingWidget$2 = widget => {
+  return widget.id === CodeGenerator;
+};
+const closeCodeGenerator = editor => {
+  const {
+    widgets
+  } = editor;
+  const index = widgets.findIndex(isMatchingWidget$2);
+  if (index === -1) {
+    return editor;
+  }
+  const newWidgets = removeEditorWidget(widgets, CodeGenerator);
+  return {
+    ...editor,
+    widgets: newWidgets,
+    focused: true
+  };
+};
 
 const isCompletionWidget = widget => {
   return widget.id === Completion;
@@ -2302,14 +2448,14 @@ const closeCompletion = editor => {
   };
 };
 
-const isMatchingWidget$2 = widget => {
+const isMatchingWidget$1 = widget => {
   return widget.id === Find;
 };
 const closeFind = editor => {
   const {
     widgets
   } = editor;
-  const index = widgets.findIndex(isMatchingWidget$2);
+  const index = widgets.findIndex(isMatchingWidget$1);
   if (index === -1) {
     return editor;
   }
@@ -2341,14 +2487,14 @@ const closeRename = editor => {
   };
 };
 
-const isMatchingWidget$1 = widget => {
+const isMatchingWidget = widget => {
   return widget.id === SourceAction;
 };
 const closeSourceAction = editor => {
   const {
     widgets
   } = editor;
-  const index = widgets.findIndex(isMatchingWidget$1);
+  const index = widgets.findIndex(isMatchingWidget);
   if (index === -1) {
     return editor;
   }
@@ -2841,7 +2987,6 @@ const wordPartRight = (line, columnIndex) => {
   return tryRegexArray(partialLine, ARRAY_PARTIAL_WORD_RIGHT_2);
 };
 
-// @ts-ignore
 const cursorCharacterLeft = editor => {
   return editorCursorHorizontalLeft(editor, characterLeft);
 };
@@ -3186,25 +3331,6 @@ const findAllReferences = async editor => {
   return editor;
 };
 
-// TODO add tests for this
-const activateByEvent = async event => {
-  await invoke$3('ExtensionHostManagement.activateByEvent', event);
-};
-
-const execute = async ({
-  editor,
-  args,
-  event,
-  method,
-  noProviderFoundMessage,
-  noProviderFoundResult = undefined
-}) => {
-  const fullEvent = `${event}:${editor.languageId}`;
-  await activateByEvent(fullEvent);
-  const result = await invoke$2(method, editor.uid, ...args);
-  return result;
-};
-
 const getFormattingEdits = async editor => {
   const edits = await execute({
     editor,
@@ -4521,7 +4647,54 @@ const moveSelectionPx = (editor, x, y) => {
   return editorMoveSelection(editor, position);
 };
 
+const User = 1;
+const Script = 2;
+const Unknown$1 = 0;
+
 const create$6 = () => {
+  const completionUid = create$8();
+  const widget = {
+    id: CodeGenerator,
+    oldState: {
+      uid: completionUid,
+      questions: [],
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0,
+      focused: false,
+      focusSource: Unknown$1
+    },
+    newState: {
+      uid: completionUid,
+      questions: [],
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0,
+      focused: true,
+      focusSource: Script
+    }
+  };
+  return widget;
+};
+
+const newStateGenerator$1 = async state => {
+  const latestState = {
+    ...state,
+    x: 100,
+    y: 100,
+    width: 150,
+    height: 45
+  };
+  return latestState;
+};
+const openCodeGenerator = async editor => {
+  const fullFocus = true;
+  return addWidgetToEditor(CodeGenerator, FocusCodeGenerator, editor, create$6, newStateGenerator$1, fullFocus);
+};
+
+const create$5 = () => {
   const completionUid = create$8();
   const completionWidget = {
     id: Completion,
@@ -4563,11 +4736,6 @@ const create$6 = () => {
   return completionWidget;
 };
 
-const OnRename = 'onRename';
-const OnCompletion = 'onCompletion';
-const OnHover = 'onHover';
-const OnTabCompletion = 'onTabCompletion';
-
 const combineResults$2 = results => {
   return results[0] ?? [];
 };
@@ -5018,7 +5186,7 @@ const openCompletion = async editor => {
   if (hasWidget(widgets, Completion)) {
     return editor;
   }
-  const completionWidget = create$6();
+  const completionWidget = create$5();
   const newWidgets = [...widgets, completionWidget];
   const newEditor = {
     ...editor,
@@ -5043,11 +5211,7 @@ const openCompletion = async editor => {
   };
 };
 
-const User = 1;
-const Script = 2;
-const Unknown$1 = 0;
-
-const create$5 = () => {
+const create$4 = () => {
   const uid = create$8();
   const widget = {
     id: Find,
@@ -5453,7 +5617,7 @@ const openFind2 = async editor => {
     return latestState;
   };
   const fullFocus = true;
-  return addWidgetToEditor(Find, FindWidget, editor, create$5, newStateGenerator, fullFocus);
+  return addWidgetToEditor(Find, FindWidget, editor, create$4, newStateGenerator, fullFocus);
 };
 
 const openFind = async state => {
@@ -5475,7 +5639,7 @@ const getRenamePosition = editor => {
   };
 };
 
-const create$4 = () => {
+const create$3 = () => {
   const completionUid = create$8();
   const renameWidget = {
     id: Rename,
@@ -5536,7 +5700,7 @@ const openRename = async editor => {
     return latestState;
   };
   const fullFocus = true;
-  return addWidgetToEditor(Rename, FocusEditorRename, editor, create$4, newStateGenerator, fullFocus);
+  return addWidgetToEditor(Rename, FocusEditorRename, editor, create$3, newStateGenerator, fullFocus);
 };
 
 const getOrganizeImportEdits = async editor => {
@@ -6432,7 +6596,7 @@ const showHover = async state => {
   return state;
 };
 
-const create$3 = () => {
+const create$2 = () => {
   const uid = create$8();
   const widget = {
     id: Hover,
@@ -6698,11 +6862,11 @@ const loadHoverContent = async state => {
   };
 };
 
-const newStateGenerator$1 = async state => {
+const newStateGenerator = async state => {
   return loadHoverContent(state);
 };
 const showHover2 = async editor => {
-  return addWidgetToEditor(Hover, FocusEditorHover, editor, create$3, newStateGenerator$1);
+  return addWidgetToEditor(Hover, FocusEditorHover, editor, create$2, newStateGenerator);
 };
 
 // TODO ask extension host worker instead
@@ -6755,7 +6919,7 @@ const loadSourceActions = async (editor, state) => {
   };
 };
 
-const create$2 = () => {
+const create$1 = () => {
   const completionUid = create$8();
   const widget = {
     id: SourceAction,
@@ -6787,7 +6951,7 @@ const showSourceActions = async editor => {
   const newStateGenerator = async state => {
     return loadSourceActions(editor, state);
   };
-  return addWidgetToEditor(SourceAction, SourceActions, editor, create$2, newStateGenerator);
+  return addWidgetToEditor(SourceAction, SourceActions, editor, create$1, newStateGenerator);
 };
 
 const compareString = (a, b) => {
@@ -7666,7 +7830,7 @@ const handelWheel = (state, deltaMode, deltaY) => {
   return newState;
 };
 
-const create$1 = () => {
+const create = () => {
   const completionUid = create$8();
   const completionWidget = {
     id: CompletionDetail,
@@ -7720,7 +7884,7 @@ const openDetails = editor => {
     };
     return newestState;
   };
-  return addWidgetToEditor(CompletionDetail, CompletionDetail$1, editor, create$1, newStateGenerator);
+  return addWidgetToEditor(CompletionDetail, CompletionDetail$1, editor, create, newStateGenerator);
 };
 
 const getEdits = async (editor, completionItem) => {
@@ -7859,6 +8023,8 @@ const ColorPickerDark = 'ColorPickerDark';
 const ColorPickerLight = 'ColorPickerLight';
 const ColorPickerRectangle = 'ColorPickerRectangle';
 const ColorPickerSlider = 'ColorPickerSlider';
+const DiagnosticError = 'DiagnosticError';
+const DiagnosticWarning = 'DiagnosticWarning';
 const ColorPickerSliderThumb = 'ColorPickerSliderThumb';
 const CompletionDetailCloseButton = 'CompletionDetailCloseButton';
 const CompletionDetailContent = 'CompletionDetailContent';
@@ -8133,6 +8299,11 @@ const handleBlur = editor => {
   return closeRename(editor);
 };
 
+const rerender = editor => {
+  // TODO avoid slow clone
+  return structuredClone(editor);
+};
+
 const focusIndex = (state, index) => {
   const newState = {
     ...state,
@@ -8239,9 +8410,6 @@ const loadFont = async (fontName, fontUrl) => {
   }
 };
 
-const load = async (fontName, fontUrl) => {
-  return loadFont(fontName, fontUrl);
-};
 const ensure = async (fontName, fontUrl) => {
   if (isLoaded(fontName)) {
     return;
@@ -8249,7 +8417,7 @@ const ensure = async (fontName, fontUrl) => {
   if (hasPending(fontName)) {
     return getPending(fontName);
   }
-  const promise = load(fontName, fontUrl);
+  const promise = loadFont(fontName, fontUrl);
   setPending(fontName, promise);
   await promise;
   removePending(fontName);
@@ -8344,49 +8512,6 @@ const moveLineDown = editor => {
   return editor;
 };
 
-const create = () => {
-  const completionUid = create$8();
-  const widget = {
-    id: CodeGenerator,
-    oldState: {
-      uid: completionUid,
-      questions: [],
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0,
-      focused: false,
-      focusSource: Unknown$1
-    },
-    newState: {
-      uid: completionUid,
-      questions: [],
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0,
-      focused: true,
-      focusSource: Script
-    }
-  };
-  return widget;
-};
-
-const newStateGenerator = async state => {
-  const latestState = {
-    ...state,
-    x: 100,
-    y: 100,
-    width: 150,
-    height: 45
-  };
-  return latestState;
-};
-const openCodeGenerator = async editor => {
-  const fullFocus = true;
-  return addWidgetToEditor(CodeGenerator, FocusCodeGenerator, editor, create, newStateGenerator, fullFocus);
-};
-
 // TODO handle multiple cursors
 const moveLineUp = editor => {
   // const rowIndex = editor.cursor.rowIndex
@@ -8911,20 +9036,25 @@ const getCursorsVirtualDom = cursors => {
   return dom;
 };
 
+// TODO use numeric value
 const Error$1 = 'error';
 const Warning = 'warning';
 
 const getDiagnosticClassName = type => {
-  // TODO use classnames enum
   switch (type) {
     case Error$1:
-      return 'DiagnosticError';
+      return DiagnosticError;
     case Warning:
-      return 'DiagnosticWarning';
+      return DiagnosticWarning;
     default:
-      return 'DiagnosticError';
+      return DiagnosticError;
   }
 };
+
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
 const getDiagnosticVirtualDom = diagnostic => {
   const {
     x,
@@ -8936,7 +9066,7 @@ const getDiagnosticVirtualDom = diagnostic => {
   const extraClassName = getDiagnosticClassName(type);
   return [{
     type: Div,
-    className: `${Diagnostic} ${extraClassName}`,
+    className: mergeClassNames(Diagnostic, extraClassName),
     width,
     height,
     top: y,
@@ -9226,23 +9356,15 @@ const renderEditor = async id => {
   return commands;
 };
 
-const isMatchingWidget = widget => {
-  return widget.id === CodeGenerator;
-};
-const closeCodeGenerator = editor => {
-  const {
-    widgets
-  } = editor;
-  const index = widgets.findIndex(isMatchingWidget);
-  if (index === -1) {
-    return editor;
+const editorDiagnosticEffect = {
+  isActive(oldEditor, newEditor) {
+    // TODO avoid slow comparison
+    return newEditor.diagnosticsEnabled && JSON.stringify(oldEditor.lines) !== JSON.stringify(newEditor.lines);
+  },
+  // TODO set effects delay / diagnostic delay
+  async apply(editor) {
+    await updateDiagnostics(editor.id);
   }
-  const newWidgets = removeEditorWidget(widgets, CodeGenerator);
-  return {
-    ...editor,
-    widgets: newWidgets,
-    focused: true
-  };
 };
 
 const keep = [
@@ -9302,9 +9424,16 @@ const widgetCommands = {
 
 // TODO wrap commands globally, not per editor
 // TODO only store editor state in editor worker, not in renderer worker also
+
+const effects = [editorDiagnosticEffect];
 const wrapCommand = fn => async (editorUid, ...args) => {
   const oldInstance = get$6(editorUid);
   const newEditor = await fn(oldInstance.newState, ...args);
+  for (const effect of effects) {
+    if (effect.isActive(oldInstance.newState, newEditor)) {
+      effect.apply(newEditor);
+    }
+  }
   set$6(editorUid, oldInstance.newState, newEditor);
   // TODO if possible, rendering should be sync
   const commands = await renderEditor(editorUid);
@@ -9323,11 +9452,6 @@ const wrapCommands = commands => {
   }
 };
 
-const codeGeneratorAccept = state => {
-  // TODO close code generator widget
-  return state;
-};
-
 const commandMap = {
   'CodeGenerator.accept': codeGeneratorAccept,
   'ColorPicker.handleSliderPointerDown': handleSliderPointerDown,
@@ -9430,6 +9554,7 @@ const commandMap = {
   'Editor.pasteText': pasteText,
   'Editor.render': renderEditor,
   'Editor.replaceRange': replaceRange,
+  'Editor.rerender': rerender,
   'Editor.save': save,
   'Editor.selectAll': selectAll,
   'Editor.selectAllLeft': editorSelectAllLeft,
@@ -10034,10 +10159,6 @@ const removeWidget = widget => {
   return [['Viewlet.send', widget.newState.uid, 'dispose']];
 };
 
-const mergeClassNames = (...classNames) => {
-  return classNames.filter(Boolean).join(' ');
-};
-
 const getCodeGeneratorVirtualDom = state => {
   const escapeToClose$1 = escapeToClose();
   const enterCode$1 = enterCode();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "5.1.0",
+  "version": "5.3.0",
   "description": "",
   "main": "dist/editorWorkerMain.js",
   "type": "module",