@lvce-editor/editor-worker 5.3.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));
@@ -1833,13 +1843,10 @@ const getVisibleDiagnostics = (editor, diagnostics) => {
   return visibleDiagnostics;
 };
 
-const updateDiagnostics = async uid => {
+const updateDiagnostics = async newState => {
   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?
@@ -1847,7 +1854,7 @@ const updateDiagnostics = async uid => {
     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;
     }
@@ -1857,8 +1864,8 @@ 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')) {
@@ -1993,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);
   }
 };
 
@@ -9363,7 +9370,7 @@ const editorDiagnosticEffect = {
   },
   // TODO set effects delay / diagnostic delay
   async apply(editor) {
-    await updateDiagnostics(editor.id);
+    await updateDiagnostics(editor);
   }
 };
 

package/package.json

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