@lvce-editor/editor-worker 5.3.0 → 5.5.0

package/dist/editorWorkerMain.js

@@ -147,9 +147,10 @@ const Format = 'format';
 const IndentLess = 'indentLess';
 const IndentMore = 'indentMore';
 const InsertLineBreak = 'insertLineBreak';
+const LineComment = 'lineComment';
+const Rename$1 = 'rename';
 const ReplaceAll$2 = 'replaceAll';
 const ToggleBlockComment = 'toggleBlockComment';
-const Rename$1 = 'rename';
 
 const map$1 = Object.create(null);
 const set$7 = (id, widget) => {
@@ -483,6 +484,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 +521,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 +543,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,21 +1844,21 @@ 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?
     // TODO throttle diagnostics
     const content = getText$1(newState);
+
+    // TODO don't really need text document sync response
+    // could perhaps save a lot of messages by using send instead of invoke
     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 +1868,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 +2004,7 @@ const createEditor = async ({
   set$6(id, emptyEditor, newEditor4);
   await invoke$2(TextDocumentSyncFull, uri, id, languageId, content);
   if (diagnosticsEnabled) {
-    updateDiagnostics(editor.uid);
+    updateDiagnostics(newEditor4);
   }
 };
 
@@ -7161,14 +7172,11 @@ const getBlockComment = async editor => {
 
 const RE_WHITESPACE_AT_START$1 = /^\s+/;
 const RE_WHITESPACE_AT_END = /\s+$/;
-
-// @ts-ignore
-const toggleBlockComment = async editor => {
-  const blockComment = await getBlockComment(editor);
-  if (!blockComment) {
-    return editor;
-  }
-  const rowIndex = editor.selections[0];
+const getBlockCommentEdits = (editor, blockComment) => {
+  const {
+    selections
+  } = editor;
+  const [rowIndex] = selections;
   const line = getLine(editor, rowIndex);
   const numberOfLines = editor.lines.length;
   let endRowIndex = rowIndex;
@@ -7222,18 +7230,7 @@ const toggleBlockComment = async editor => {
         deleted: [blockCommentEnd],
         origin: ToggleBlockComment
       };
-      // @ts-ignore
       changes.push(change1, change2);
-      // Editor.moveCursors(editor, (editor, cursor) => {
-      //   let newColumnIndex = cursor.columnIndex - blockComment[0].length
-      //   if (cursor.columnIndex === endColumnIndex + blockComment[1].length) {
-      //     newColumnIndex -= blockComment[1].length
-      //   }
-      //   return {
-      //     rowIndex: cursor.rowIndex,
-      //     columnIndex: newColumnIndex,
-      //   }
-      // })
     } else {
       const change1 = {
         start: {
@@ -7356,7 +7353,16 @@ const toggleBlockComment = async editor => {
   // }
   // RendererProcess.invoke(/* setLines */ 2135, /* lines */ lines)
 
-  return scheduleDocument(editor, changes);
+  return changes;
+};
+
+const toggleBlockComment = async editor => {
+  const blockComment = await getBlockComment(editor);
+  if (!blockComment) {
+    return editor;
+  }
+  const edits = getBlockCommentEdits(editor, blockComment);
+  return scheduleDocument(editor, edits);
 };
 
 const getLineComment = async editor => {
@@ -7376,7 +7382,7 @@ const getLineCommentEdit = (rowIndex, line, lineComment) => {
     if (line[index + lineComment.length] === ' ') {
       return {
         inserted: [''],
-        deleted: [lineComment.length + 1],
+        deleted: [lineComment + ' '],
         start: {
           rowIndex,
           columnIndex: index
@@ -7385,7 +7391,7 @@ const getLineCommentEdit = (rowIndex, line, lineComment) => {
           rowIndex,
           columnIndex: index + lineComment.length + 1
         },
-        type: /* singleLineEdit */1
+        origin: LineComment
       };
     }
     return {
@@ -7399,7 +7405,7 @@ const getLineCommentEdit = (rowIndex, line, lineComment) => {
         rowIndex,
         columnIndex: index + lineComment.length
       },
-      type: /* singleLineEdit */1
+      origin: LineComment
     };
   }
   return {
@@ -7413,11 +7419,10 @@ const getLineCommentEdit = (rowIndex, line, lineComment) => {
       rowIndex,
       columnIndex: index
     },
-    type: /* singleLineEdit */1
+    origin: LineComment
   };
 };
 
-// @ts-ignore
 const editorToggleLineComment = async editor => {
   const lineComment = await getLineComment(editor);
   if (!lineComment) {
@@ -8013,7 +8018,7 @@ const handleSashPointerUp = (state, eventX, eventY) => {
   return state;
 };
 
-const CodeGeneratorInput = 'CodeGeneratorInput';
+const CodeGeneratorInput$1 = 'CodeGeneratorInput';
 const CodeGeneratorMessage = 'CodeGeneratorMessage';
 const CodeGeneratorWidget = 'CodeGeneratorWidget';
 const ColoredMaskIcon = 'ColoredMaskIcon';
@@ -9363,7 +9368,7 @@ const editorDiagnosticEffect = {
   },
   // TODO set effects delay / diagnostic delay
   async apply(editor) {
-    await updateDiagnostics(editor.id);
+    await updateDiagnostics(editor);
   }
 };
 
@@ -10159,6 +10164,9 @@ const removeWidget = widget => {
   return [['Viewlet.send', widget.newState.uid, 'dispose']];
 };
 
+const CodeGeneratorInput = 'CodeGeneratorInput';
+const ToggleReplace$1 = 'ToggleReplace';
+
 const getCodeGeneratorVirtualDom = state => {
   const escapeToClose$1 = escapeToClose();
   const enterCode$1 = enterCode();
@@ -10168,10 +10176,10 @@ const getCodeGeneratorVirtualDom = state => {
     childCount: 2
   }, {
     type: Input,
-    className: mergeClassNames(CodeGeneratorInput, InputBox),
+    className: mergeClassNames(CodeGeneratorInput$1, InputBox),
     childCount: 0,
     placeholder: enterCode$1,
-    name: 'CodeGeneratorInput'
+    name: CodeGeneratorInput
   }, {
     type: Div,
     className: CodeGeneratorMessage,
@@ -11096,7 +11104,7 @@ const getSearchToggleButtonVirtualDom = (replaceExpanded, onClick = '') => {
     title: 'Toggle Replace',
     ariaLabel: 'Toggle Replace',
     ariaExpanded: replaceExpanded,
-    name: 'ToggleReplace',
+    name: ToggleReplace$1,
     childCount: 1,
     'data-command': 'toggleReplace',
     onClick,

package/package.json

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