stop macro once motions fail

rebornix · Oct 18, 2016 · da8c437 · da8c437
1 parent 86b058d
commit da8c437
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
@@ -1320,13 +1320,18 @@ export class ModeHandler implements vscode.Disposable {
       recordedState.actionsRun = actions.slice(0, ++i);
       vimState = await this.runAction(vimState, recordedState, action);
 
+      if (vimState.lastMovementFailed) {
+        break;
+      }
+
       await this.updateView(vimState, true);
     }
 
     vimState.isRunningDotCommand = false;
     vimState.cursorPositionJustBeforeAnythingHappened = vimState.allCursors.map(x => x.stop);
     return vimState;
   }
+
   public async updateView(vimState: VimState, drawSelection = true): Promise<void> {
     // Draw selection (or cursor)
 

diff --git a/test/mode/normalModeTests/dot.test.ts b/test/mode/normalModeTests/dot.test.ts
@@ -8,7 +8,8 @@ suite("Dot Operator", () => {
     let modeHandler: ModeHandler = new ModeHandler();
 
     let {
-        newTest
+        newTest,
+        newTestOnly
     } = getTestingFunctions(modeHandler);
 
     setup(async () => {

diff --git a/test/testSimplifier.ts b/test/testSimplifier.ts
@@ -226,7 +226,6 @@ async function testIt(modeHandler: ModeHandler, testObj: ITestObject): Promise<v
   //
   let actualPosition = Position.FromVSCodePosition(TextEditor.getSelection().start);
   let expectedPosition = helper.endPosition;
-
   assert.equal(actualPosition.line, expectedPosition.line, "Cursor LINE position is wrong.");
   assert.equal(actualPosition.character, expectedPosition.character, "Cursor CHARACTER position is wrong.");