@lvce-editor/editor-worker 19.70.2 → 19.70.4

package/dist/editorWorkerMain.js

@@ -8785,9 +8785,64 @@ const cursorDown = editor => {
   return scheduleSelections(editor, newSelections);
 };
 
+const getSelectionsAtLineEnd = (selections, lines) => {
+  const newSelections = new Uint32Array(selections.length);
+  for (let i = 0; i < selections.length; i += 4) {
+    const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn] = getSelectionPairs(selections, i);
+    const rowIndex = selectionStartRow === selectionEndRow && selectionStartColumn === selectionEndColumn ? selectionStartRow : selectionEndRow;
+    const columnIndex = selectionStartRow === selectionEndRow && selectionStartColumn === selectionEndColumn ? getLineLength(lines[rowIndex]) : selectionEndColumn;
+    newSelections[i] = rowIndex;
+    newSelections[i + 1] = columnIndex;
+    newSelections[i + 2] = rowIndex;
+    newSelections[i + 3] = columnIndex;
+  }
+  return newSelections;
+};
+const removeDuplicateSelections = (editor, selections) => {
+  const uniqueSelections = new Uint32Array(selections.length);
+  const selectionIndices = new Map();
+  const primarySelectionIndex = editor.primarySelectionIndex || 0;
+  let uniqueSelectionCount = 0;
+  let newPrimarySelectionIndex = 0;
+  for (let i = 0; i < selections.length; i += 4) {
+    const rowIndex = selections[i + 2];
+    const columnIndex = selections[i + 3];
+    const key = `${rowIndex}:${columnIndex}`;
+    const existingSelectionIndex = selectionIndices.get(key);
+    if (existingSelectionIndex !== undefined) {
+      if (i === primarySelectionIndex) {
+        newPrimarySelectionIndex = existingSelectionIndex * 4;
+      }
+      continue;
+    }
+    selectionIndices.set(key, uniqueSelectionCount);
+    uniqueSelections.set(selections.subarray(i, i + 4), uniqueSelectionCount * 4);
+    if (i === primarySelectionIndex) {
+      newPrimarySelectionIndex = uniqueSelectionCount * 4;
+    }
+    uniqueSelectionCount++;
+  }
+  return {
+    primarySelectionIndex: newPrimarySelectionIndex,
+    selections: uniqueSelections.slice(0, uniqueSelectionCount * 4)
+  };
+};
+
 // @ts-ignore
 const cursorEnd = editor => {
-  return editorCursorHorizontalRight(editor, lineEnd);
+  const {
+    lines,
+    selections: oldSelections
+  } = editor;
+  const movedSelections = getSelectionsAtLineEnd(oldSelections, lines);
+  const {
+    primarySelectionIndex,
+    selections
+  } = removeDuplicateSelections(editor, movedSelections);
+  return scheduleSelections({
+    ...editor,
+    primarySelectionIndex
+  }, selections);
 };
 
 // @ts-ignore
@@ -16100,7 +16155,7 @@ const getSavedLanguageId = (savedState, languages) => {
   }
   return explicitLanguageId;
 };
-const loadContent = async (state, savedState, largeFile = false) => {
+const loadContent = async (state, savedState, largeFile = false, focus = true) => {
   const {
     assetDir,
     height,
@@ -16199,7 +16254,7 @@ const loadContent = async (state, savedState, largeFile = false) => {
       ...newEditor1,
       differences: [],
       focus: FocusEditorText$1,
-      focused: true,
+      focused: focus,
       initial: false,
       loadError: getErrorMessage(error),
       textInfos: []
@@ -16261,7 +16316,7 @@ const loadContent = async (state, savedState, largeFile = false) => {
     ...newEditor3WithBreadcrumbs,
     differences,
     focus: FocusEditorText$1,
-    focused: true,
+    focused: focus,
     textInfos
   };
   const completionsOnTypeRaw = await get$3('editor.completionsOnType');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "19.70.2",
+  "version": "19.70.4",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"