@lvce-editor/editor-worker 5.2.0 → 5.4.0

package/dist/editorWorkerMain.js

@@ -483,6 +483,10 @@ const getTabCount = string => {
   return count;
 };
 
+const measureTextWidthFast = (text, charWidth) => {
+  return text.length * charWidth;
+};
+
 const getFontString = (fontWeight, fontSize, fontFamily) => {
   return `${fontWeight} ${fontSize}px ${fontFamily}`;
 };
@@ -516,16 +520,15 @@ const getContext = () => {
   return ctx;
 };
 
-const measureTextWidth = (text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth) => {
+// TODO for text editor, could dispose measuring canvas after editor has been initialized to free up offscreencanvas space
+
+const measureTextWidthSlow = (text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth) => {
   string(text);
   number$1(fontWeight);
   number$1(fontSize);
   string(fontFamily);
   boolean(isMonoSpaceFont);
   number$1(charWidth);
-  if (isMonoSpaceFont) {
-    return text.length * charWidth;
-  }
   if (typeof letterSpacing !== 'number') {
     throw new TypeError('letterSpacing must be of type number');
   }
@@ -539,6 +542,13 @@ const measureTextWidth = (text, fontWeight, fontSize, fontFamily, letterSpacing,
   return width;
 };
 
+const measureTextWidth = (text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth) => {
+  if (isMonoSpaceFont) {
+    return measureTextWidthFast(text, charWidth);
+  }
+  return measureTextWidthSlow(text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth);
+};
+
 const normalizeText = (text, normalize, tabSize) => {
   if (normalize) {
     return text.replaceAll(Tab, Space$1.repeat(tabSize));
@@ -1797,28 +1807,54 @@ const getDiagnosticType = diagnostic => {
 
 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: diagnostic.columnIndex * editor.columnWidth,
-      y: (diagnostic.rowIndex - editor.minLineY) * editor.rowHeight,
-      width: 20,
-      height: editor.rowHeight,
+      x,
+      y,
+      width: diagnosticWidth,
+      height: rowHeight,
       type: getDiagnosticType(diagnostic)
     });
   }
   return visibleDiagnostics;
 };
 
-const updateDiagnostics = async uid => {
+const updateDiagnostics = async newState => {
   try {
     // TODO handle error
     // TODO handle race condition
-    const {
-      newState
-    } = get$6(uid);
-    // TODO request diagnostics from extension host
+
+    // 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);
+    const latest = get$6(newState.id);
     if (!latest) {
       return;
     }
@@ -1828,9 +1864,13 @@ const updateDiagnostics = async uid => {
       diagnostics,
       decorations
     };
-    set$6(uid, latest.oldState, newEditor);
-    await invoke$3('Editor.rerender', uid);
+    set$6(newState.id, latest.oldState, newEditor);
+    await invoke$3('Editor.rerender', newState.id);
   } catch (error) {
+    // @ts-ignore
+    if (error && error.message.includes('No diagnostic provider found')) {
+      return;
+    }
     console.error(`Failed to update diagnostics: ${error}`);
   }
 };
@@ -1960,7 +2000,7 @@ const createEditor = async ({
   set$6(id, emptyEditor, newEditor4);
   await invoke$2(TextDocumentSyncFull, uri, id, languageId, content);
   if (diagnosticsEnabled) {
-    updateDiagnostics(editor.uid);
+    updateDiagnostics(newEditor4);
   }
 };
 
@@ -8377,9 +8417,6 @@ const loadFont = async (fontName, fontUrl) => {
   }
 };
 
-const load = async (fontName, fontUrl) => {
-  return loadFont(fontName, fontUrl);
-};
 const ensure = async (fontName, fontUrl) => {
   if (isLoaded(fontName)) {
     return;
@@ -8387,7 +8424,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);
@@ -9326,6 +9363,17 @@ const renderEditor = async id => {
   return commands;
 };
 
+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 = [
 // 'ColorPicker.handleSliderPointerDown',
 // 'ColorPicker.handleSliderPointerMove',
@@ -9383,9 +9431,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);

package/package.json

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