@lvce-editor/editor-worker 19.61.3 → 19.61.5

package/dist/editorWorkerMain.js

@@ -4211,6 +4211,14 @@ const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionCh
   const newLines = applyEdits(editor, changes);
   const partialNewEditor = updateLines(editor, newLines);
   const newSelections = selectionChanges || applyEdit$1(partialNewEditor, changes);
+  const selectionHistory = {
+    after: newSelections,
+    before: editor.selections
+  };
+  Object.defineProperty(changes, 'selectionHistory', {
+    configurable: true,
+    value: selectionHistory
+  });
   // TODO should separate rendering from business logic somehow
   // currently hard to test because need to mock editor height, top, left,
   // invalidStartIndex, lineCache, etc. just for testing editorType
@@ -4281,7 +4289,7 @@ const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionCh
   };
 };
 // @ts-ignore
-const scheduleDocumentAndCursorsSelectionIsUndo = async (editor, changes) => {
+const scheduleDocumentAndCursorsSelectionIsUndo = async (editor, changes, selectionChanges = undefined) => {
   object(editor);
   array(changes);
   if (changes.length === 0) {
@@ -4289,7 +4297,7 @@ const scheduleDocumentAndCursorsSelectionIsUndo = async (editor, changes) => {
   }
   const newLines = applyEdits(editor, changes);
   const partialNewEditor = updateLines(editor, newLines);
-  const newSelections = applyEdit$1(partialNewEditor, changes);
+  const newSelections = selectionChanges || applyEdit$1(partialNewEditor, changes);
   const invalidStartIndex = Math.min(editor.invalidStartIndex, changes[0].start.rowIndex);
   const newEditor = {
     ...partialNewEditor,
@@ -7445,40 +7453,69 @@ const copy$1 = async editor => {
   return editor;
 };
 
-// TODO handle multiline selection
-
+const getCopyLineOperations = selections => {
+  const operations = [];
+  for (let i = 0; i < selections.length; i += 4) {
+    const [startRowIndex,, selectionEndRowIndex, endColumnIndex] = getSelectionPairs(selections, i);
+    const endRowIndex = startRowIndex < selectionEndRowIndex && endColumnIndex === 0 ? selectionEndRowIndex - 1 : selectionEndRowIndex;
+    operations.push({
+      endRowIndex,
+      startRowIndex
+    });
+  }
+  operations.sort((a, b) => a.startRowIndex - b.startRowIndex || a.endRowIndex - b.endRowIndex);
+  const mergedOperations = [];
+  for (const operation of operations) {
+    const previous = mergedOperations.at(-1);
+    if (previous && previous.endRowIndex >= operation.startRowIndex) {
+      mergedOperations[mergedOperations.length - 1] = {
+        ...previous,
+        endRowIndex: Math.max(previous.endRowIndex, operation.endRowIndex)
+      };
+    } else {
+      mergedOperations.push(operation);
+    }
+  }
+  return mergedOperations;
+};
 const copyLineDown = editor => {
   const {
     selections
   } = editor;
-  const rows = [];
-  for (let i = 0; i < selections.length; i += 4) {
-    const rowIndex = selections[i];
-    number(rowIndex);
-    rows.push(rowIndex);
-  }
-  const uniqueRows = [...new Set(rows)].toSorted((a, b) => a - b);
-  const changes = uniqueRows.map(rowIndex => {
-    const position = {
-      columnIndex: 0,
-      rowIndex
-    };
+  const operations = getCopyLineOperations(selections);
+  const changes = operations.map(({
+    endRowIndex,
+    startRowIndex
+  }) => {
+    const selectedLines = editor.lines.slice(startRowIndex, endRowIndex + 1);
     return {
-      deleted: [''],
-      end: position,
-      inserted: [getLine$1(editor, rowIndex), ''],
-      start: position
+      deleted: selectedLines,
+      end: {
+        columnIndex: editor.lines[endRowIndex].length,
+        rowIndex: endRowIndex
+      },
+      inserted: [...selectedLines, ...selectedLines],
+      start: {
+        columnIndex: 0,
+        rowIndex: startRowIndex
+      }
     };
   });
-  const rowOffsets = new Map(uniqueRows.map((row, index) => [row, index + 1]));
+  const getRowOffset = rowIndex => {
+    let offset = 0;
+    for (const operation of operations) {
+      if (operation.startRowIndex <= rowIndex) {
+        offset += operation.endRowIndex - operation.startRowIndex + 1;
+      }
+    }
+    return offset;
+  };
   const selectionChanges = new Uint32Array(selections.length);
   for (let i = 0; i < selections.length; i += 4) {
-    const rowIndex = selections[i] + rowOffsets.get(selections[i]);
-    const columnIndex = selections[i + 1];
-    selectionChanges[i] = rowIndex;
-    selectionChanges[i + 1] = columnIndex;
-    selectionChanges[i + 2] = rowIndex;
-    selectionChanges[i + 3] = columnIndex;
+    selectionChanges[i] = selections[i] + getRowOffset(selections[i]);
+    selectionChanges[i + 1] = selections[i + 1];
+    selectionChanges[i + 2] = selections[i + 2] + getRowOffset(selections[i + 2]);
+    selectionChanges[i + 3] = selections[i + 3];
   }
   return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
 };
@@ -10286,14 +10323,16 @@ const getChanges = (lines, selections, languageConfiguration, indentUnit) => {
     if (isEmpty(selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn)) {
       const line = lines[selectionStartRow];
       const before = line.slice(0, selectionStartColumn);
+      const after = line.slice(selectionStartColumn);
       const indent = getIndent(before);
       if (shouldIncreaseIndent(before, increaseIndentRegex)) {
+        const inserted = after ? ['', indent + indentUnit, indent] : ['', indent + indentUnit];
         changes.push({
           deleted: getSelectionText({
             lines
           }, range),
           end: end,
-          inserted: ['', indent + indentUnit, indent],
+          inserted,
           origin: InsertLineBreak,
           start: start
         });
@@ -11104,12 +11143,13 @@ const redo = state => {
     return state;
   }
   const last = redoStack.at(-1);
+  const selectionChanges = last.selectionHistory?.after;
   const newState = {
     ...state,
     redoStack: redoStack.slice(0, -1),
     undoStack: [...state.undoStack, last]
   };
-  return scheduleDocumentAndCursorsSelectionIsUndo(newState, last);
+  return scheduleDocumentAndCursorsSelectionIsUndo(newState, last, selectionChanges);
 };
 
 // @ts-ignore
@@ -12625,12 +12665,14 @@ const typeWithAutoClosing = async (editor, text) => {
 };
 
 const inverseChange = edit => {
-  const endColumnIndex = edit.end.columnIndex - edit.deleted[0].length + edit.inserted[0].length;
+  const insertedLines = edit.inserted;
+  const endRowIndex = edit.start.rowIndex + insertedLines.length - 1;
+  const endColumnIndex = insertedLines.length === 1 ? edit.start.columnIndex + insertedLines[0].length : insertedLines.at(-1).length;
   return {
-    deleted: edit.inserted,
+    deleted: insertedLines,
     end: {
       columnIndex: endColumnIndex,
-      rowIndex: edit.end.rowIndex
+      rowIndex: endRowIndex
     },
     inserted: edit.deleted,
     start: edit.start
@@ -12646,12 +12688,13 @@ const undo = state => {
   }
   const last = undoStack.at(-1);
   const inverseChanges = last.toReversed().map(inverseChange);
+  const selectionChanges = last.selectionHistory?.before;
   const newState = {
     ...state,
     redoStack: [...(state.redoStack || []), last],
     undoStack: undoStack.slice(0, -1)
   };
-  return scheduleDocumentAndCursorsSelectionIsUndo(newState, inverseChanges);
+  return scheduleDocumentAndCursorsSelectionIsUndo(newState, inverseChanges, selectionChanges);
 };
 
 const unfold = editor => {

package/package.json

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