Merge pull request #1297 from xlaech/FixDinVisualModeBug

D in visual mode behaves like d
VSCodeVim · Feb 15, 2017 · 2753942 · 2753942
2 parents 8140e4f + 47dfca6
commit 2753942
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/src/actions/actions.ts b/src/actions/actions.ts
@@ -1869,6 +1869,10 @@ export class DeleteOperatorVisual extends BaseOperator {
     public modes = [ModeName.Visual, ModeName.VisualLine];
 
     public async run(vimState: VimState, start: Position, end: Position): Promise<VimState> {
+      // ensures linewise deletion when in visual mode
+      // see special case in DeleteOperator.delete()
+      vimState.currentRegisterMode = RegisterMode.LineWise;
+
       return await new DeleteOperator(this.multicursorIndex).run(vimState, start, end);
     }
 }

diff --git a/test/mode/modeVisual.test.ts b/test/mode/modeVisual.test.ts
@@ -128,11 +128,11 @@ suite("Mode Visual", () => {
   });
 
   newTest({
-      title: "Can handle H key",
-      start: ['1', '2', '|3', '4', '5'],
-      keysPressed: 'vH',
-      end: ['|1', '2', '3', '4', '5']
-    });
+    title: "Can handle H key",
+    start: ['1', '2', '|3', '4', '5'],
+    keysPressed: 'vH',
+    end: ['|1', '2', '3', '4', '5']
+  });
 
   test("handles case where we delete over a newline", async () => {
     await modeHandler.handleMultipleKeyEvents("ione two\n\nthree four".split(""));
@@ -472,7 +472,7 @@ suite("Mode Visual", () => {
     });
 
     newTest({
-      title: "Can handle 'Y' in visual mode" ,
+      title: "Can handle 'Y' in visual mode",
       start: ['one', '|two'],
       keysPressed: 'vwYP',
       end: ['one', '|two', 'two'],
@@ -639,4 +639,23 @@ suite("Mode Visual", () => {
     end: ["tes|est"],
     endMode: ModeName.Normal
   });
+
+  suite("D command will remove all selected lines", () => {
+    newTest({
+      title: "D deletes all selected lines",
+      start: ["first line", "test| line1", "test line2", "second line"],
+      keysPressed: "vjD",
+      end: ["first line", "|second line"],
+      endMode: ModeName.Normal
+    });
+
+    newTest({
+      title: "D deletes the current line",
+      start: ["first line", "test| line1", "second line"],
+      keysPressed: "vlllD",
+      end: ["first line", "|second line"],
+      endMode: ModeName.Normal
+    });
+
+  });
 });