Fix search with count

src/actions/commands/commandLine.ts

@@ -329,8 +329,17 @@ class CommandInsertInSearchMode extends BaseCommand {
         return vimState;
       }
 
-      // Move cursor to next match
-      const nextMatch = searchState.getNextSearchMatchPosition(vimState.cursorStopPosition);
+      const count = vimState.recordedState.count || 1;
+      let searchPos = vimState.cursorStopPosition;
+      let nextMatch: { pos: Position; match: boolean; index: number } | undefined;
+      for (let i = 0; i < count; i++) {
+        // Move cursor to next match
+        nextMatch = searchState.getNextSearchMatchPosition(searchPos);
+        if (nextMatch === undefined) {
+          break;
+        }
+        searchPos = nextMatch.pos;
+      }
       if (nextMatch === undefined) {
         StatusBar.displayError(
           vimState,

test/mode/modeNormal.test.ts

@@ -213,6 +213,27 @@ suite('Mode Normal', () => {
     end: ['{hello, |}'],
   });
 
+  newTest({
+    title: "Can handle 'd/'",
+    start: ['one |two three four'],
+    keysPressed: 'd/four\n',
+    end: ['one |four'],
+  });
+
+  newTest({
+    title: "Can handle 'd/' with count ([count]d/[word])",
+    start: ['one |two two two two'],
+    keysPressed: '3d/two\n',
+    end: ['one |two'],
+  });
+
+  newTest({
+    title: "Can handle 'd/' with count (d[count]/[word])",
+    start: ['one |two two two two'],
+    keysPressed: 'd3/two\n',
+    end: ['one |two'],
+  });
+
   newTest({
     title: "Can handle 'cw'",
     start: ['text text tex|t'],

test/mode/normalModeTests/motions.test.ts

@@ -327,6 +327,27 @@ suite('Motions in Normal Mode', () => {
     end: ['one two one tw|o'],
   });
 
+  newTest({
+    title: 'Can run a forward search with count 1',
+    start: ['|one two two two'],
+    keysPressed: '1/tw\n',
+    end: ['one |two two two'],
+  });
+
+  newTest({
+    title: 'Can run a forward search with count 3',
+    start: ['|one two two two'],
+    keysPressed: '3/tw\n',
+    end: ['one two two |two'],
+  });
+
+  newTest({
+    title: 'Can run a forward search with count exceeding max number of matches',
+    start: ['|one two two two'],
+    keysPressed: '5/tw\n',
+    end: ['one two |two two'],
+  });
+
   // These "remembering history between editor" tests have started
   // breaking. Since I don't remember these tests ever breaking for real, and
   // because they're the cause of a lot of flaky tests, I'm disabling these for
@@ -392,6 +413,27 @@ suite('Motions in Normal Mode', () => {
     end: ['one |two two three'],
   });
 
+  newTest({
+    title: 'Can run a reverse search with count 1',
+    start: ['one one one |two'],
+    keysPressed: '1?on\n',
+    end: ['one one |one two'],
+  });
+
+  newTest({
+    title: 'Can run a reverse search with count 3',
+    start: ['one one one |two'],
+    keysPressed: '3?on\n',
+    end: ['|one one one two'],
+  });
+
+  newTest({
+    title: 'Can run a reverse search with count exceeding max number of matches',
+    start: ['one one one |two'],
+    keysPressed: '5?on\n',
+    end: ['one |one one two'],
+  });
+
   // test('Remembers a reverse search from another editor', async () => {
   //   // adding another editor
   //   await setupWorkspace();