fix #501 (#632)

* fix #501 * fixing whitespace from failed checks
VSCodeVim · Aug 20, 2016 · 61312b7 · 61312b7
1 parent 3a3d09b
commit 61312b7
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/src/actions/actions.ts b/src/actions/actions.ts
@@ -1820,6 +1820,11 @@ class MoveDown extends BaseMovement {
   public async execAction(position: Position, vimState: VimState): Promise<Position> {
     return position.getDown(vimState.desiredColumn);
   }
+
+  public async execActionForOperator(position: Position, vimState: VimState): Promise<Position> {
+    vimState.currentRegisterMode = RegisterMode.LineWise;
+    return position.getDown(position.getLineEnd().character);
+  }
 }
 
 @RegisterAction
@@ -2198,8 +2203,15 @@ class MoveNonBlank extends BaseMovement {
 class MoveNextLineNonBlank extends BaseMovement {
   keys = ["\n"];
 
-  public async execAction(position: Position, vimState: VimState): Promise<Position> {
-    return position.getDown(0).getFirstLineNonBlankChar();
+  public async execActionWithCount(position: Position, vimState: VimState, count: number): Promise<Position> {
+    vimState.currentRegisterMode = RegisterMode.LineWise;
+
+    // Count === 0 if just pressing enter in normal mode, need to still go down 1 line
+    if (count === 0) {
+      count++;
+    }
+
+    return position.getDownByCount(count).getFirstLineNonBlankChar();
   }
 }
 

diff --git a/test/mode/modeNormal.test.ts b/test/mode/modeNormal.test.ts
@@ -183,6 +183,20 @@ suite("Mode Normal", () => {
       end: ['abcd|h'],
     });
 
+    newTest({
+      title: "Can handle 'd3' then <enter>",
+      start: ['|1', '2', '3', '4', '5', '6'],
+      keysPressed: 'd3\n',
+      end: ['|5', '6'],
+    });
+
+    newTest({
+      title: "Can handle 'dj'",
+      start: ['|11', '22', '33', '44', '55', '66'],
+      keysPressed: 'dj',
+      end: ['|33', '44', '55', '66'],
+    });
+
     newTest({
       title: "Can handle 'cw'",
       start: ['text text tex|t'],