fix - exotic count-related bugs along with tests

VSCodeVim · Oct 11, 2018 · e742c57 · e742c57
1 parent e07f0b2
commit e742c57
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/cmd_line/subparsers/substitute.ts b/src/cmd_line/subparsers/substitute.ts
@@ -96,7 +96,8 @@ function parseSubstituteFlags(scanner: Scanner): number {
         flags = flags | node.SubstituteFlags.UsePreviousPattern;
         break;
       default:
-        return node.SubstituteFlags.None;
+        scanner.backup();
+        return flags;
     }
 
     index++;
@@ -139,7 +140,6 @@ export function parseSubstituteCommandArgs(args: string): node.SubstituteCommand
         pattern: undefined,
         replace: '', // ignored in this context
         flags: node.SubstituteFlags.None,
-        count: 1,
       });
     }
     let scanner: Scanner;
@@ -153,7 +153,6 @@ export function parseSubstituteCommandArgs(args: string): node.SubstituteCommand
           pattern: '',
           replace: '',
           flags: node.SubstituteFlags.None,
-          count: 1,
         });
       }
 
@@ -168,7 +167,6 @@ export function parseSubstituteCommandArgs(args: string): node.SubstituteCommand
           pattern: searchPattern,
           replace: '',
           flags: node.SubstituteFlags.None,
-          count: 1,
         });
       }
       replaceString = parsePattern('', scanner, delimiter)[0];

diff --git a/test/cmd_line/substitute.test.ts b/test/cmd_line/substitute.test.ts
@@ -37,6 +37,13 @@ suite('Basic substitute', () => {
     assertEqualLines(['dbd']);
   });
 
+  newTest({
+    title: 'Replace with flags AND count',
+    start: ['|blah blah', 'blah', 'blah blah', 'blah blah'],
+    keysPressed: ':.s/blah/yay/g 2\n',
+    end: ['|yay yay', 'yay', 'blah blah', 'blah blah'],
+  });
+
   test('Replace with `c` flag', async () => {
     const confirmStub = sinon.stub(SubstituteCommand.prototype, 'confirmReplacement').returns(true);
     await modeHandler.handleMultipleKeyEvents(['i', 'a', 'b', 'a', '<Esc>']);
@@ -104,6 +111,20 @@ suite('Basic substitute', () => {
     end: ['blah blah', '|yay', 'yay blah', 'yay blah'],
   });
 
+  newTest({
+    title: 'Repeat replacement across relative line range',
+    start: ['|blah blah', 'blah', 'blah blah', 'blah blah'],
+    keysPressed: ':s/blah/yay\nj3:s\n',
+    end: ['yay blah', '|yay', 'yay blah', 'yay blah'],
+  });
+
+  newTest({
+    title: 'Replace with range AND count but no flags',
+    start: ['|blah blah', 'blah', 'blah blah', 'blah blah'],
+    keysPressed: '3:s/blah/yay/ 2\n',
+    end: ['|blah blah', 'blah', 'yay blah', 'yay blah'],
+  });
+
   newTest({
     title: 'Undocumented: operator without LHS assumes dot as LHS',
     start: ['blah blah', 'bla|h', 'blah blah', 'blah blah'],