@lvce-editor/editor-worker 19.78.11 → 19.78.13

package/dist/diff-sdk.js

@@ -21238,22 +21238,31 @@ const handleWheel$2 = (editor, deltaMode, eventDeltaX, eventDeltaY) => {
   return setDelta(editor, deltaMode, eventDeltaX, eventDeltaY);
 };
 
-// @ts-ignore
-const getChanges$2 = selections => {
+const getChanges$2 = editor => {
+  const {
+    lines,
+    selections
+  } = editor;
   const changes = [];
-  const rowsToIndentLess = [];
+  const rowsToIndentLess = new Set();
   for (let i = 0; i < selections.length; i += 4) {
     const selectionStartRow = selections[i];
     const selectionEndRow = selections[i + 2];
     for (let i = selectionStartRow; i <= selectionEndRow; i++) {
-      rowsToIndentLess.push(i);
+      rowsToIndentLess.add(i);
     }
   }
   for (const rowToIndent of rowsToIndentLess) {
+    const line = lines[rowToIndent];
+    const leadingWhitespace = line.match(/^[\t ]+/)?.[0] ?? '';
+    const whitespaceToRemove = leadingWhitespace.startsWith('\t') ? '\t' : leadingWhitespace.slice(0, editor.tabSize || 2);
+    if (!whitespaceToRemove) {
+      continue;
+    }
     changes.push({
-      deleted: ['  '],
+      deleted: [whitespaceToRemove],
       end: {
-        columnIndex: 2,
+        columnIndex: whitespaceToRemove.length,
         rowIndex: rowToIndent
       },
       inserted: [''],
@@ -21269,10 +21278,7 @@ const getChanges$2 = selections => {
 
 // @ts-ignore
 const indentLess = editor => {
-  const {
-    selections
-  } = editor;
-  const changes = getChanges$2(selections);
+  const changes = getChanges$2(editor);
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
@@ -28647,7 +28653,7 @@ const commandMap = {
   'Editor.hasCachedCharacterWidth': has$1,
   'Editor.hotReload': hotReload,
   'Editor.incrementSelection': wrapCommand(incrementSelection),
-  'Editor.indendLess': wrapCommand(indentLess),
+  'Editor.indentLess': wrapCommand(indentLess),
   'Editor.indentMore': wrapCommand(indentMore),
   'Editor.insertLineBreak': wrapCommand(insertLineBreak),
   'Editor.loadContent': wrapCommand(loadContent),
@@ -28735,6 +28741,7 @@ const commandMap = {
   'Editor.typeWithAutoClosing': typeWithAutoClosingCommand,
   'Editor.undo': wrapCommand(undo),
   'Editor.unfold': wrapCommand(unfold),
+  'Editor.unindent': wrapCommand(indentLess),
   'Editor.unIndent': wrapCommand(editorUnindent),
   'Editor.updateColorPickerValue': wrapCommand(updateColorPickerValue$1),
   'Editor.updateDebugInfo': updateDebugInfo,

package/dist/editorWorkerMain.js

@@ -21689,22 +21689,31 @@ const handleWheel$2 = (editor, deltaMode, eventDeltaX, eventDeltaY) => {
   return setDelta(editor, deltaMode, eventDeltaX, eventDeltaY);
 };
 
-// @ts-ignore
-const getChanges$2 = selections => {
+const getChanges$2 = editor => {
+  const {
+    lines,
+    selections
+  } = editor;
   const changes = [];
-  const rowsToIndentLess = [];
+  const rowsToIndentLess = new Set();
   for (let i = 0; i < selections.length; i += 4) {
     const selectionStartRow = selections[i];
     const selectionEndRow = selections[i + 2];
     for (let i = selectionStartRow; i <= selectionEndRow; i++) {
-      rowsToIndentLess.push(i);
+      rowsToIndentLess.add(i);
     }
   }
   for (const rowToIndent of rowsToIndentLess) {
+    const line = lines[rowToIndent];
+    const leadingWhitespace = line.match(/^[\t ]+/)?.[0] ?? '';
+    const whitespaceToRemove = leadingWhitespace.startsWith('\t') ? '\t' : leadingWhitespace.slice(0, editor.tabSize || 2);
+    if (!whitespaceToRemove) {
+      continue;
+    }
     changes.push({
-      deleted: ['  '],
+      deleted: [whitespaceToRemove],
       end: {
-        columnIndex: 2,
+        columnIndex: whitespaceToRemove.length,
         rowIndex: rowToIndent
       },
       inserted: [''],
@@ -21720,10 +21729,7 @@ const getChanges$2 = selections => {
 
 // @ts-ignore
 const indentLess = editor => {
-  const {
-    selections
-  } = editor;
-  const changes = getChanges$2(selections);
+  const changes = getChanges$2(editor);
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
@@ -29095,7 +29101,7 @@ const commandMap = {
   'Editor.hasCachedCharacterWidth': has$1,
   'Editor.hotReload': hotReload,
   'Editor.incrementSelection': wrapCommand(incrementSelection),
-  'Editor.indendLess': wrapCommand(indentLess),
+  'Editor.indentLess': wrapCommand(indentLess),
   'Editor.indentMore': wrapCommand(indentMore),
   'Editor.insertLineBreak': wrapCommand(insertLineBreak),
   'Editor.loadContent': wrapCommand(loadContent),
@@ -29183,6 +29189,7 @@ const commandMap = {
   'Editor.typeWithAutoClosing': typeWithAutoClosingCommand,
   'Editor.undo': wrapCommand(undo),
   'Editor.unfold': wrapCommand(unfold),
+  'Editor.unindent': wrapCommand(indentLess),
   'Editor.unIndent': wrapCommand(editorUnindent),
   'Editor.updateColorPickerValue': wrapCommand(updateColorPickerValue$1),
   'Editor.updateDebugInfo': updateDebugInfo,

package/package.json

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