fix #652 (#655)

VSCodeVim · Aug 26, 2016 · 9d543e6 · 9d543e6
1 parent 18097c4
commit 9d543e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/actions/actions.ts b/src/actions/actions.ts
@@ -614,6 +614,16 @@ class CommandInsertInSearchMode extends BaseCommand {
       vimState.currentMode = ModeName.Normal;
       vimState.cursorPosition = searchState.getNextSearchMatchPosition(searchState.searchCursorStartPosition).pos;
 
+      // Repeat the previous search if no new string is entered
+      if (searchState.searchString === "") {
+        const prevSearch = vimState.searchStatePrevious!;
+        if (prevSearch) {
+          searchState.searchString = prevSearch.searchString;
+        }
+      }
+      // Store this search
+      vimState.searchStatePrevious = searchState;
+
       return vimState;
     } else if (key === "<escape>") {
       vimState.currentMode = ModeName.Normal;

diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
@@ -93,6 +93,8 @@ export class VimState {
 
   public searchState: SearchState | undefined = undefined;
 
+  public searchStatePrevious: SearchState | undefined = undefined;
+
   public replaceState: ReplaceState | undefined = undefined;
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,6 +93,8 @@ export class VimState { @@
       public searchState: SearchState | undefined = undefined;
+      public searchStatePrevious: SearchState | undefined = undefined;
       public replaceState: ReplaceState | undefined = undefined;
       /**
@@ Expand Down @@