@lvce-editor/editor-worker 19.29.14 → 19.29.16

package/dist/editorWorkerMain.js

@@ -67,7 +67,7 @@ const String$1 = 4;
 const Boolean$1 = 5;
 const Function$1 = 6;
 const Null = 7;
-const Unknown$2 = 8;
+const Unknown$3 = 8;
 const getType = value => {
   switch (typeof value) {
     case 'number':
@@ -87,7 +87,7 @@ const getType = value => {
     case 'boolean':
       return Boolean$1;
     default:
-      return Unknown$2;
+      return Unknown$3;
   }
 };
 const object = value => {
@@ -2090,6 +2090,7 @@ const InsertLineBreak = 'insertLineBreak';
 const LineComment = 'lineComment';
 const Rename = 'rename';
 const ToggleBlockComment$1 = 'toggleBlockComment';
+const Unknown$2 = 'unknown';
 
 const map$1 = Object.create(null);
 const set$7 = (id, widget) => {
@@ -12246,6 +12247,9 @@ const applyTabCompletion = (editor, result) => {
 };
 
 const handleTab = async editor => {
+  if (!isEverySelectionEmpty(editor.selections)) {
+    return indentMore(editor);
+  }
   const result = await getTabCompletion(editor);
   if (!result) {
     // TODO enter tab or two spaces
@@ -12601,59 +12605,75 @@ const loadContent = async (state, savedState) => {
   return newEditor5;
 };
 
-// TODO move cursor
-// TODO multiple cursors -> VS Code removes multiple cursors
-// TODO with selection -> VS Code moves whole selection
+const getSelectedLineRange = (selections, primarySelectionIndex) => {
+  const [startRowIndex,, selectionEndRowIndex, endColumnIndex] = getSelectionPairs(selections, primarySelectionIndex);
+  const endRowIndex = startRowIndex < selectionEndRowIndex && endColumnIndex === 0 ? selectionEndRowIndex - 1 : selectionEndRowIndex;
+  return {
+    endRowIndex,
+    startRowIndex
+  };
+};
+const movePositionDown = (lines, rowIndex, columnIndex) => {
+  const newRowIndex = rowIndex + 1;
+  if (newRowIndex < lines.length) {
+    return [newRowIndex, columnIndex];
+  }
+  const lastRowIndex = lines.length - 1;
+  return [lastRowIndex, lines[rowIndex - 1].length];
+};
+const getSelectionChanges = (lines, selections, primarySelectionIndex, direction) => {
+  const startRowIndex = selections[primarySelectionIndex];
+  const startColumnIndex = selections[primarySelectionIndex + 1];
+  const endRowIndex = selections[primarySelectionIndex + 2];
+  const endColumnIndex = selections[primarySelectionIndex + 3];
+  if (direction < 0) {
+    return new Uint32Array([startRowIndex - 1, startColumnIndex, endRowIndex - 1, endColumnIndex]);
+  }
+  const [newStartRowIndex, newStartColumnIndex] = movePositionDown(lines, startRowIndex, startColumnIndex);
+  const [newEndRowIndex, newEndColumnIndex] = movePositionDown(lines, endRowIndex, endColumnIndex);
+  return new Uint32Array([newStartRowIndex, newStartColumnIndex, newEndRowIndex, newEndColumnIndex]);
+};
+const moveLines = (editor, direction) => {
+  const {
+    lines,
+    primarySelectionIndex = 0,
+    selections
+  } = editor;
+  const {
+    endRowIndex,
+    startRowIndex
+  } = getSelectedLineRange(selections, primarySelectionIndex);
+  const lastRowIndex = lines.length - 1;
+  if (direction < 0 && startRowIndex === 0 || direction > 0 && endRowIndex === lastRowIndex) {
+    return editor;
+  }
+  const editStartRowIndex = direction < 0 ? startRowIndex - 1 : startRowIndex;
+  const editEndRowIndex = direction < 0 ? endRowIndex : endRowIndex + 1;
+  const selectedLines = lines.slice(startRowIndex, endRowIndex + 1);
+  const inserted = direction < 0 ? [...selectedLines, lines[startRowIndex - 1]] : [lines[endRowIndex + 1], ...selectedLines];
+  const changes = [{
+    deleted: lines.slice(editStartRowIndex, editEndRowIndex + 1),
+    end: {
+      columnIndex: lines[editEndRowIndex].length,
+      rowIndex: editEndRowIndex
+    },
+    inserted,
+    origin: Unknown$2,
+    start: {
+      columnIndex: 0,
+      rowIndex: editStartRowIndex
+    }
+  }];
+  const selectionChanges = getSelectionChanges(lines, selections, primarySelectionIndex, direction);
+  return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
+};
+
 const moveLineDown = editor => {
-  // const rowIndex = editor.cursor.rowIndex
-  // if (rowIndex === editor.lines.length - 1) {
-  //   return
-  // }
-  // const documentEdits = [
-  //   {
-  //     type: /* splice */ 2,
-  //     rowIndex: rowIndex,
-  //     count: 2,
-  //     newLines: [TextDocument.getLine(editor.textDocument, rowIndex + 1), TextDocument.getLine(editor.textDocument, rowIndex)],
-  //   },
-  // ]
-  // // @ts-ignore
-  // const cursorEdits = Editor.moveCursors(editor, (editor, cursor) => {
-  //   return {
-  //     rowIndex: cursor.rowIndex + 1,
-  //     columnIndex: cursor.columnIndex,
-  //   }
-  // })
-  // @ts-ignore
-  // Editor.scheduleDocumentAndCursors(editor, documentEdits, cursorEdits)
-  return editor;
+  return moveLines(editor, 1);
 };
 
-// TODO handle multiple cursors
 const moveLineUp = editor => {
-  // const rowIndex = editor.cursor.rowIndex
-  // if (rowIndex === 0) {
-  //   return
-  // }
-  // const documentEdits = [
-  //   {
-  //     type: /* splice */ 2,
-  //     rowIndex: rowIndex - 1,
-  //     count: 2,
-  //     newLines: [TextDocument.getLine(editor.textDocument, rowIndex), TextDocument.getLine(editor.textDocument, rowIndex - 1)],
-  //   },
-  // ]
-  // // @ts-ignore
-  // const cursorEdits = Editor.moveCursors(editor, (editor, cursor) => {
-  //   return {
-  //     // TODO handle bottom 0
-  //     rowIndex: cursor.rowIndex - 1,
-  //     columnIndex: cursor.columnIndex,
-  //   }
-  // })
-  // // @ts-ignore
-  // Editor.scheduleDocumentAndCursors(editor, documentEdits, cursorEdits)
-  return editor;
+  return moveLines(editor, -1);
 };
 
 /**

package/package.json

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