Merge pull request #931 from xconverge/repeat-search

fixes #652
VSCodeVim · Oct 18, 2016 · d1bb526 · d1bb526
2 parents c20a663 + d7321e1
commit d1bb526
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/actions/actions.ts b/src/actions/actions.ts
@@ -1208,7 +1208,6 @@ class CommandInsertInSearchMode extends BaseCommand {
       searchState.searchString = searchState.searchString.slice(0, -1);
     } else if (key === "\n") {
       vimState.currentMode = ModeName.Normal;
-      vimState.cursorPosition = searchState.getNextSearchMatchPosition(vimState.cursorPosition).pos;
 
       // Repeat the previous search if no new string is entered
       if (searchState.searchString === "") {
@@ -1220,6 +1219,9 @@ class CommandInsertInSearchMode extends BaseCommand {
       // Store this search
       vimState.searchStatePrevious = searchState;
 
+      // Move cursor to next match
+      vimState.cursorPosition = searchState.getNextSearchMatchPosition(vimState.cursorPosition).pos;
+
       return vimState;
     } else if (key === "<Esc>") {
       vimState.currentMode = ModeName.Normal;