@lvce-editor/editor-worker 1.12.0 → 1.14.0

package/dist/editorWorkerMain.js

@@ -3532,7 +3532,6 @@ const Alt = 2;
 
 // TODO first change cursor position, then run go to definition
 // cursor should appear at mousedown position immediately
-// @ts-ignore
 const handleSingleClickWithAlt = async (editor, position) => {
   const {
     rowIndex,
@@ -3547,8 +3546,6 @@ const handleSingleClickWithAlt = async (editor, position) => {
   const newEditor2 = await goToDefinition(newEditor);
   return newEditor2;
 };
-
-// @ts-ignore
 const handleSingleClickWithCtrl = async (editor, position) => {
   const selections = editor.selections;
   for (let i = 0; i < selections.length; i += 4) {
@@ -3572,8 +3569,6 @@ const handleSingleClickWithCtrl = async (editor, position) => {
   newSelections[insertIndex + 3] = position.columnIndex;
   return scheduleSelections(editor, newSelections);
 };
-
-// @ts-ignore
 const handleSingleClickDefault = (editor, position) => {
   setPosition$1(position);
   return {
@@ -3582,8 +3577,6 @@ const handleSingleClickDefault = (editor, position) => {
     focused: true
   };
 };
-
-// @ts-ignore
 const getFn = modifier => {
   switch (modifier) {
     case Alt:
@@ -3594,8 +3587,6 @@ const getFn = modifier => {
       return handleSingleClickDefault;
   }
 };
-
-// @ts-ignore
 const handleSingleClick = async (editor, modifier, x, y) => {
   object(editor);
   number$1(modifier);
@@ -3647,7 +3638,6 @@ const handleTripleClick = (editor, modifier, x, y) => {
   };
 };
 
-// @ts-ignore
 const handleMouseDown = (state, modifier, x, y, detail) => {
   switch (detail) {
     case Single:
@@ -7768,7 +7758,7 @@ const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true) =>
   return dom;
 };
 
-const getIncrementalEdits = (oldState, newState) => {
+const getIncrementalEdits = async (oldState, newState) => {
   if (!newState.undoStack) {
     return undefined;
   }
@@ -7780,39 +7770,8 @@ const getIncrementalEdits = (oldState, newState) => {
       const lines = newState.lines;
       const oldLine = oldState.lines[rowIndex];
       const newLine = lines[rowIndex];
-      const oldTokenizer = get(oldState.tokenizerId);
-      const newTokenizer = get(newState.tokenizerId);
-      const initialLineState = newState.lineCache[rowIndex] || getInitialLineState(newTokenizer.initialLineState);
-      const {
-        tokens: oldTokens
-      } = safeTokenizeLine(newState.languageId, oldTokenizer.tokenizeLine, oldLine, initialLineState, newTokenizer.hasArrayReturn);
-      // @ts-ignore
-      const {
-        tokens: newTokens,
-        lineState
-      } = safeTokenizeLine(newState.languageId, newTokenizer.tokenizeLine, newLine, initialLineState, newTokenizer.hasArrayReturn);
-      if (newTokens.length !== oldTokens.length) {
-        return undefined;
-      }
-      const incrementalEdits = [];
-      let offset = 0;
-      const relativeRowIndex = rowIndex - newState.minLineY;
-      for (let i = 0; i < oldTokens.length; i += 2) {
-        const oldTokenType = oldTokens[i];
-        const oldTokenLength = oldTokens[i + 1];
-        const newTokenType = newTokens[i];
-        const newTokenLength = newTokens[i + 1];
-        if (oldTokenType === newTokenType && oldTokenLength !== newTokenLength && oldTokenLength > 0) {
-          const columnTokenIndex = i / 2;
-          incrementalEdits.push({
-            rowIndex: relativeRowIndex,
-            columnIndex: columnTokenIndex,
-            text: newLine.slice(offset, offset + newTokenLength)
-          });
-        }
-        offset += newTokenLength;
-      }
-      if (incrementalEdits.length === 1) {
+      const incrementalEdits = await invoke$1('TokenizeIncremental.tokenizeIncremental', newState.uid, newState.languageId, oldLine, newLine, rowIndex, newState.minLineY);
+      if (incrementalEdits && incrementalEdits.length === 1) {
         return incrementalEdits;
       }
     }
@@ -7844,7 +7803,7 @@ const renderLines = {
     return oldState.lines === newState.lines && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.deltaX === newState.deltaX && oldState.width === newState.width;
   },
   async apply(oldState, newState) {
-    const incrementalEdits = getIncrementalEdits(oldState, newState);
+    const incrementalEdits = await getIncrementalEdits(oldState, newState);
     if (incrementalEdits) {
       return [/* method */'setIncrementalEdits', /* incrementalEdits */incrementalEdits];
     }
@@ -7898,6 +7857,11 @@ const renderFocus = {
     return oldState.focused === newState.focused;
   },
   apply(oldState, newState) {
+    // TODO avoid side effect
+    if (newState.focused) {
+      const FocusEditorText = 12;
+      invoke$3('Focus.setFocus', FocusEditorText);
+    }
     return [/* method */'setFocused', newState.focused];
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "1.12.0",
+  "version": "1.14.0",
   "description": "",
   "main": "dist/testWorkerMain.js",
   "type": "module",