Make n and N act as failed motions at end/start of document with nowrapscan

Refs #4908

Author: J-Fields

src/actions/motion.ts

@@ -436,7 +436,7 @@ class CommandNextSearchMatch extends BaseMovement {
   keys = ['n'];
   isJump = true;
 
-  public async execAction(position: Position, vimState: VimState): Promise<Position> {
+  public async execAction(position: Position, vimState: VimState): Promise<Position | IMovement> {
     const searchState = globalState.searchState;
 
     if (!searchState || searchState.searchString === '') {
@@ -451,7 +451,7 @@ class CommandNextSearchMatch extends BaseMovement {
         vimState,
         VimError.fromCode(ErrorCode.PatternNotFound, searchState.searchString)
       );
-      return position;
+      return failedMovement(vimState);
     }
 
     // we have to handle a special case here: searching for $ or \n,
@@ -474,7 +474,7 @@ class CommandNextSearchMatch extends BaseMovement {
           searchState.searchString
         )
       );
-      return position;
+      return failedMovement(vimState);
     }
 
     reportSearch(nextMatch.index, searchState.getMatchRanges(vimState.editor).length, vimState);
@@ -488,7 +488,7 @@ class CommandPreviousSearchMatch extends BaseMovement {
   keys = ['N'];
   isJump = true;
 
-  public async execAction(position: Position, vimState: VimState): Promise<Position> {
+  public async execAction(position: Position, vimState: VimState): Promise<Position | IMovement> {
     const searchState = globalState.searchState;
 
     if (!searchState || searchState.searchString === '') {
@@ -503,7 +503,7 @@ class CommandPreviousSearchMatch extends BaseMovement {
         vimState,
         VimError.fromCode(ErrorCode.PatternNotFound, searchState.searchString)
       );
-      return position;
+      return failedMovement(vimState);
     }
 
     const searchForward = searchState.searchDirection === SearchDirection.Forward;
@@ -533,7 +533,7 @@ class CommandPreviousSearchMatch extends BaseMovement {
           searchState.searchString
         )
       );
-      return position;
+      return failedMovement(vimState);
     }
 
     reportSearch(prevMatch.index, searchState.getMatchRanges(vimState.editor).length, vimState);

test/macro.test.ts

@@ -105,4 +105,12 @@ suite('Record and execute a macro', () => {
     keysPressed: 'qajyyP<C-a>kq8@a',
     end: ['C|ountdown:', '10', '9', '8', '7', '6', '5', '4', '3', '2', '1', 'LAUNCH!!!'],
   });
+
+  newTest({
+    title: 'Failed `n` stops macro from repeating',
+    config: { wrapscan: false },
+    start: ['|one two three', 'one two three', 'one two three'],
+    keysPressed: '/two\n0' + 'qq' + 'nea XXX<Esc>q' + '5@q',
+    end: ['one two XXX three', 'one two XXX three', 'one two XX|X three'],
+  });
 });