[vim keymap] Add count and empty query support for :s

Author: mightyguava

keymap/vim.js

@@ -2283,27 +2283,39 @@
         var regexPart = argString.substring(slashes[0] + 1, slashes[1]);
         var replacePart = '';
         var flagsPart;
+        var count;
         if (slashes[1]) {
           replacePart = argString.substring(slashes[1] + 1, slashes[2]);
         }
         if (slashes[2]) {
-          flagsPart = argString.substring(slashes[2] + 1);
+          // After the 3rd slash, we can have flags followed by a space followed
+          // by count.
+          var trailing = argString.substring(slashes[2] + 1).split(' ');
+          flagsPart = trailing[0];
+          count = parseInt(trailing[1]);
         }
         if (flagsPart) {
           regexPart = regexPart + '/' + flagsPart;
         }
-        updateSearchQuery(cm, regexPart, true /** ignoreCase */,
+        if (regexPart) {
+          // If regex part is empty, then use the previous query. Otherwise use
+          // the regex part as the new query.
+          updateSearchQuery(cm, regexPart, true /** ignoreCase */,
             true /** smartCase */);
+        }
         var state = getSearchState(cm);
         var query = state.getQuery();
-        var startPos = clipCursorToContent(cm, { line: params.line || 0,
-            ch: 0 });
+        var lineStart = params.line || 0;
+        var lineEnd = params.lineEnd || lineStart;
+        if (count) {
+          lineStart = lineEnd;
+          lineEnd = lineStart + count - 1;
+        }
+        var startPos = clipCursorToContent(cm, { line: lineStart, ch: 0 });
         function doReplace() {
           for (var cursor = cm.getSearchCursor(query, startPos);
-               cursor.findNext();) {
-            if (!isInRange(cursor.from(), params.line, params.lineEnd)) {
-              break;
-            }
+               cursor.findNext() &&
+                   isInRange(cursor.from(), lineStart, lineEnd);) {
             var text = cm.getRange(cursor.from(), cursor.to());
             var newText = text.replace(query, replacePart);
             cursor.replace(newText);

test/vim_test.js

@@ -897,6 +897,24 @@ testVim('ex_substitute_capture', function(cm, vim, helpers) {
   helpers.doEx('s/(\\d+)/$1$1/')
   eq('a1111 a1212 a1313', cm.getValue());
 }, { value: 'a11 a12 a13' });
+testVim('ex_substitute_empty_query', function(cm, vim, helpers) {
+  // If the query is empty, use last query.
+  cm.setCursor(1, 0);
+  cm.openDialog = helpers.fakeOpenDialog('1');
+  helpers.doKeys('/');
+  helpers.doEx('s//b');
+  eq('abb ab2 ab3', cm.getValue());
+}, { value: 'a11 a12 a13' });
+testVim('ex_substitute_count', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doEx('s/\\d/0/i 2');
+  eq('1\n0\n0\n4', cm.getValue());
+}, { value: '1\n2\n3\n4' });
+testVim('ex_substitute_count_with_range', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doEx('1,3s/\\d/0/ 3');
+  eq('1\n2\n0\n0', cm.getValue());
+}, { value: '1\n2\n3\n4' });
 // TODO: Reset key maps after each test.
 testVim('ex_map_key2key', function(cm, vim, helpers) {
   helpers.doEx('map a x');