Fix #397. (#413)

VSCodeVim · Jul 8, 2016 · 5587de0 · 5587de0
1 parent ded53ff
commit 5587de0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
@@ -736,6 +736,10 @@ export class ModeHandler implements vscode.Disposable {
         let recordedState = vimState.recordedState;
 
         if (recordedState.operator) {
+            if (start.compareTo(stop) > 0) {
+                [start, stop] = [stop, start];
+            }
+
             if (vimState.currentMode !== ModeName.Visual &&
                 vimState.currentMode !== ModeName.VisualLine &&
                 vimState.currentRegisterMode !== RegisterMode.LineWise) {
@@ -746,10 +750,6 @@ export class ModeHandler implements vscode.Disposable {
                 }
             }
 
-            if (start.compareTo(stop) > 0) {
-                [start, stop] = [stop, start];
-            }
-
             if (this.currentModeName === ModeName.VisualLine) {
                 start = start.getLineBegin();
                 stop  = stop.getLineEnd();

diff --git a/test/mode/modeNormal.test.ts b/test/mode/modeNormal.test.ts
@@ -121,16 +121,16 @@ suite("Mode Normal", () => {
 
     newTest({
       title: "Can handle 'db'",
-      start: ['text tex|t'],
+      start: ['One tw|o'],
       keysPressed: '$db',
-      end: ['text |t'],
+      end: ['One |o'],
     });
 
     newTest({
       title: "Can handle 'db then 'db' again",
-      start: ['text tex|t'],
+      start: ['One tw|o'],
       keysPressed: '$dbdb',
-      end: ['|t'],
+      end: ['|o'],
     });
 
     newTest({