[vim] fix substitute command when joining multiple lines

Author: benhormann

keymap/vim.js

@@ -5268,7 +5268,7 @@
       // Set up all the functions.
       cm.state.vim.exMode = true;
       var done = false;
-      var lastPos, modifiedLineNumber;
+      var lastPos, modifiedLineNumber, joined;
       function replaceAll() {
         cm.operation(function() {
           while (!done) {
@@ -5285,13 +5285,14 @@
         searchCursor.replace(newText);
         modifiedLineNumber = searchCursor.to().line;
         lineEnd += modifiedLineNumber - unmodifiedLineNumber;
+        joined = modifiedLineNumber < unmodifiedLineNumber;
       }
       function next() {
         // The below only loops to skip over multiple occurrences on the same
         // line when 'global' is not true.
         while(searchCursor.findNext() &&
               isInRange(searchCursor.from(), lineStart, lineEnd)) {
-          if (!global && searchCursor.from().line == modifiedLineNumber) {
+          if (!global && searchCursor.from().line == modifiedLineNumber && !joined) {
             continue;
           }
           cm.scrollIntoView(searchCursor.from(), 30);

test/vim_test.js

@@ -4311,6 +4311,10 @@ testSubstitute('ex_substitute_newline_join_global', {
   value: 'one,two \n three,four \n five \n six',
   expectedValue: 'one,two \n three,four , five \n six',
   expr: '2s/\\n/,/g'});
+testSubstitute('ex_substitute_newline_join_noglobal', {
+  value: 'one,two \n three,four \n five \n six\n',
+  expectedValue: 'one,two \n three,four , five , six\n',
+  expr: '2,3s/\\n/,/'});
 testSubstitute('ex_substitute_newline_replacement', {
   value: 'one,two, \n three,four,',
   expectedValue: 'one\ntwo\n \n three\nfour\n',