Set correct cursor and selection after code format.

VSCodeVim · Jul 19, 2016 · f3c1ad0 · f3c1ad0
1 parent 2a8b46e
commit f3c1ad0
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/actions/actions.ts b/src/actions/actions.ts
@@ -610,6 +610,18 @@ class CommandFormatCode extends BaseCommand {
 
   public async exec(position: Position, vimState: VimState): Promise<VimState> {
     await vscode.commands.executeCommand("editor.action.format");
+
+    let selection = vscode.window.activeTextEditor.selection;
+    let line = selection.start.line;
+
+    if (selection.start.isAfter(selection.end)) {
+      line = selection.end.line;
+    }
+
+    let newCursorPosition = new Position(line, 0);
+    vimState.cursorPosition = newCursorPosition;
+    vimState.cursorStartPosition = newCursorPosition;
+    vscode.window.activeTextEditor.selection = new vscode.Selection(newCursorPosition, newCursorPosition);
     vimState.currentMode = ModeName.Normal;
     return vimState;
   }