@lvce-editor/editor-worker 12.1.0 → 12.3.0

package/dist/editorWorkerMain.js

@@ -3420,7 +3420,7 @@ const getVisibleDiagnostics = (editor, diagnostics) => {
     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);
+    const y = getY(rowIndex, minLineY, rowHeight) - rowHeight;
     visibleDiagnostics.push({
       x,
       y,
@@ -3464,9 +3464,10 @@ const updateDiagnostics = async newState => {
   } catch (error) {
     // @ts-ignore
     if (error && error.message.includes('No diagnostic provider found')) {
-      return;
+      return newState;
     }
     console.error(`Failed to update diagnostics: ${error}`);
+    return newState;
   }
 };
 
@@ -3622,8 +3623,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);
+
+  // TODO await promise
   if (diagnosticsEnabled) {
-    updateDiagnostics(newEditor4);
+    await updateDiagnostics(newEditor4);
   }
 };
 
@@ -7823,7 +7826,21 @@ const tabCompletion = async editor => {
   }
 };
 
-const getBlockComment = async editor => {
+const getBlockComment = async (editor, offset) => {
+  // TODO ask extension host worker,
+  // execute block comment provider with
+  // uri, language id, offset
+  // and the extension returns a matching block comment or undefined
+  try {
+    await activateByEvent(`onLanguage:${editor.languageId}`);
+    // @ts-ignore
+    const blockComment = await invoke$6(`ExtensionHostCommment.execute`, editor.uid, offset);
+    if (blockComment) {
+      return blockComment;
+    }
+  } catch {
+    // ignore
+  }
   const languageConfiguration = await getLanguageConfiguration(editor);
   if (!languageConfiguration?.comments?.blockComment) {
     return undefined;
@@ -8018,7 +8035,8 @@ const getBlockCommentEdits = (editor, blockComment) => {
 };
 
 const toggleBlockComment = async editor => {
-  const blockComment = await getBlockComment(editor);
+  const offset = getOffsetAtCursor$1(editor);
+  const blockComment = await getBlockComment(editor, offset);
   if (!blockComment) {
     return editor;
   }
@@ -9352,6 +9370,13 @@ const getSourceActions = async editorUid => {
   const actions = await getEditorSourceActions(editorUid);
   return actions;
 };
+const getDiagnostics$1 = async editorUid => {
+  const editor = getEditor(editorUid);
+  const {
+    diagnostics
+  } = editor;
+  return diagnostics;
+};
 
 const pending = Object.create(null);
 const loaded = Object.create(null);
@@ -10546,18 +10571,7 @@ const updateDebugInfo = async debugId => {
   await invoke$9('Editor.rerender', key);
 };
 
-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);
-  }
-};
-
-const keep = ['ActivateByEvent.activateByEvent', 'ExtensionHostManagement.activateByEvent', 'Editor.applyEdit2', 'Editor.applyEdits2', 'Editor.closeFind2', 'Editor.closeWidget2', 'Editor.create', 'Editor.getKeyBindings', 'Editor.getSourceActions', 'Editor.getLines2', 'Editor.getPositionAtCursor', 'Editor.getOffsetAtCursor', 'Editor.getQuickPickMenuEntries', 'Editor.getSelections', 'Editor.hotReload', 'Editor.getSelections2', 'Editor.getText', 'Editor.getWordAt', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getUri', 'Editor.getWordBefore', 'Editor.getWordBefore2', 'Editor.offsetAt', 'Editor.render', 'Editor.setSelections2', 'Editor.updateDebugInfo', 'Editor.getLanguageId', 'Editor.getProblems', 'Editor.getKeys', 'Font.ensure', 'HandleMessagePort.handleMessagePort', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker'
+const keep = ['ActivateByEvent.activateByEvent', 'ExtensionHostManagement.activateByEvent', 'Editor.applyEdit2', 'Editor.applyEdits2', 'Editor.closeFind2', 'Editor.closeWidget2', 'Editor.create', 'Editor.getKeyBindings', 'Editor.getSourceActions', 'Editor.getLines2', 'Editor.getPositionAtCursor', 'Editor.getOffsetAtCursor', 'Editor.getQuickPickMenuEntries', 'Editor.getSelections', 'Editor.hotReload', 'Editor.getSelections2', 'Editor.getDiagnostics', 'Editor.getText', 'Editor.getWordAt', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getUri', 'Editor.getWordBefore', 'Editor.getWordBefore2', 'Editor.offsetAt', 'Editor.render', 'Editor.setSelections2', 'Editor.updateDebugInfo', 'Editor.getLanguageId', 'Editor.getProblems', 'Editor.getKeys', 'Font.ensure', 'HandleMessagePort.handleMessagePort', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker'
 // 'ColorPicker.handleSliderPointerDown',
 // 'ColorPicker.handleSliderPointerMove',
 // 'ColorPicker.loadContent',
@@ -10587,7 +10601,6 @@ 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$4(editorUid);
   const state = oldInstance.newState;
@@ -10595,11 +10608,6 @@ const wrapCommand = fn => async (editorUid, ...args) => {
   if (state === newEditor) {
     return newEditor;
   }
-  for (const effect of effects) {
-    if (effect.isActive(oldInstance.newState, newEditor)) {
-      effect.apply(newEditor);
-    }
-  }
   // TODO if editor did not change, no need to update furthur
 
   // TODO combine neweditor with latest editor?
@@ -10690,6 +10698,7 @@ const commandMap = {
   'Editor.getQuickPickMenuEntries': getQuickPickMenuEntries,
   'Editor.getSelections': getSelections,
   'Editor.getSelections2': getSelections2,
+  'Editor.getDiagnostics': getDiagnostics$1,
   'Editor.getText': getText,
   'Editor.getUri': getUri,
   'Editor.getWordAt': getWordAt$1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "12.1.0",
+  "version": "12.3.0",
   "license": "MIT",
   "author": "Lvce Editor",
   "type": "module",