Fix autoindent on cc/S #2497

Many VSCodeVim commands already respect VS Code's build-in indentation, so I thought it should stay that way `cc` and `S` now act like when vim's filetype indent is turned on
VSCodeVim · Jun 13, 2018 · 32e6121 · 32e6121
1 parent d6c61bc
commit 32e6121
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 24 deletions.
diff --git a/src/actions/commands/actions.ts b/src/actions/commands/actions.ts
@@ -2130,16 +2130,7 @@ class CommandClearLine extends BaseCommand {
   runsOnceForEachCountPrefix = false;
 
   public async exec(position: Position, vimState: VimState): Promise<VimState> {
-    let count = vimState.recordedState.count || 1;
-    let end = position
-      .getDownByCount(Math.max(0, count - 1))
-      .getLineEnd()
-      .getLeft();
-    return new operator.ChangeOperator().run(
-      vimState,
-      position.getLineBeginRespectingIndent(),
-      end
-    );
+    return new operator.ChangeOperator(this.multicursorIndex).runRepeat(vimState, position, 1);
   }
 
   // Don't clash with sneak

diff --git a/src/actions/operator.ts b/src/actions/operator.ts
@@ -566,21 +566,23 @@ export class ChangeOperator extends BaseOperator {
   }
 
   public async runRepeat(vimState: VimState, position: Position, count: number): Promise<VimState> {
-    const lineIsAllWhitespace = TextEditor.getLineAt(position).text.trim() === '';
     vimState.currentRegisterMode = RegisterMode.LineWise;
-    if (lineIsAllWhitespace) {
-      return this.run(
-        vimState,
-        position.getLineBegin(),
-        position.getDownByCount(Math.max(0, count - 1)).getLineEnd()
-      );
-    } else {
-      return this.run(
-        vimState,
-        position.getLineBeginRespectingIndent(),
-        position.getDownByCount(Math.max(0, count - 1)).getLineEnd()
-      );
+
+    vimState = await this.run(
+      vimState,
+      position.getLineBegin(),
+      position.getDownByCount(Math.max(0, count - 1)).getLineEnd()
+    );
+
+    if (configuration.autoindent) {
+      vimState.recordedState.transformations.push({
+        type: 'reindent',
+        cursorIndex: this.multicursorIndex,
+        diff: new PositionDiff(0, 1), // Handle transition from Normal to Insert modes
+      });
     }
+
+    return vimState;
   }
 }
 

diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
@@ -980,6 +980,20 @@ export class ModeHandler implements vscode.Disposable {
             accumulatedPositionDifferences[command.cursorIndex].push(command.diff);
           }
           break;
+        case 'reindent':
+          await vscode.commands.executeCommand('editor.action.reindentselectedlines');
+          if (command.diff) {
+            if (command.cursorIndex === undefined) {
+              throw new Error('No cursor index - this should never ever happen!');
+            }
+
+            if (!accumulatedPositionDifferences[command.cursorIndex]) {
+              accumulatedPositionDifferences[command.cursorIndex] = [];
+            }
+
+            accumulatedPositionDifferences[command.cursorIndex].push(command.diff);
+          }
+          break;
         default:
           console.warn(`Unhandled text transformation type: ${command.type}.`);
           break;

diff --git a/src/transformations/transformations.ts b/src/transformations/transformations.ts
@@ -215,6 +215,19 @@ export interface Tab {
   diff?: PositionDiff;
 }
 
+/**
+ * Represents reindenting the selected line
+ */
+export interface Reindent {
+  type: 'reindent';
+  cursorIndex?: number;
+
+  /**
+   * Move the cursor this much.
+   */
+  diff?: PositionDiff;
+}
+
 /**
  * Represents macro
  */
@@ -246,7 +259,8 @@ export type Transformation =
   | Macro
   | ContentChangeTransformation
   | DeleteTextTransformation
-  | Tab;
+  | Tab
+  | Reindent;
 
 /**
  * Text Transformations