Fix some bugs in search util script

Author: marijnh

demo/search.html

@@ -71,7 +71,7 @@ <h1>CodeMirror: Search/Replace Demo</h1>
       <dt>Ctrl-F / Cmd-F</dt><dd>Start searching</dd>
       <dt>Ctrl-G / Cmd-G</dt><dd>Find next</dd>
       <dt>Shift-Ctrl-G / Shift-Cmd-G</dt><dd>Find previous</dd>
-      <dt>Ctrl-R / Cmd-Option-F</dt><dd>Replace</dd>
+      <dt>Shift-Ctrl-F / Cmd-Option-F</dt><dd>Replace</dd>
       <dt>Shift-Ctrl-R / Shift-Cmd-Option-F</dt><dd>Replace all</dd>
     </dl>
     <p>Searching is enabled by

lib/codemirror.js

@@ -1846,7 +1846,7 @@ var CodeMirror = (function() {
     "Ctrl-Home": "goDocStart", "Alt-Up": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Down": "goDocEnd",
     "Ctrl-Left": "goWordLeft", "Ctrl-Right": "goWordRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
     "Ctrl-Backspace": "delWordLeft", "Ctrl-Delete": "delWordRight", "Ctrl-S": "save", "Ctrl-F": "find",
-    "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Ctrl-R": "replace", "Shift-Ctrl-R": "replaceAll",
+    "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
     fallthrough: "basic"
   };
   keyMap.macDefault = {

lib/util/search.js

@@ -8,7 +8,8 @@
 
 (function() {
   function SearchState() {
-    this.lastPos = null; this.query = this.replacing = null; this.marked = [];
+    this.posFrom = this.posTo = null;
+    this.query = this.replacing = null; this.marked = [];
   }
   function getSearchState(cm) {
     return cm._searchState || (cm._searchState = new SearchState());
@@ -34,7 +35,7 @@
           for (var cursor = cm.getSearchCursor(query); cursor.findNext();)
             state.marked.push(cm.markText(cursor.from(), cursor.to(), "CodeMirror-searching"));
         }
-        state.lastPos = cm.getCursor();
+        state.posFrom = state.posTo = cm.getCursor();
         findNext(cm, rev);
       });
     });
@@ -50,13 +51,13 @@
         if (match) cm.replaceSelection(state.replacing.replace(/\$(\d)/, function(w, i) {return match[i];}));
       }
     }
-    var cursor = cm.getSearchCursor(state.query, state.lastPos);
+    var cursor = cm.getSearchCursor(state.query, rev ? state.posFrom : state.posTo);
     if (!cursor.find(rev)) {
       cursor = cm.getSearchCursor(state.query, rev ? {line: cm.lineCount() - 1} : {line: 0, ch: 0});
       if (!cursor.find(rev)) return;
     }
     cm.setSelection(cursor.from(), cursor.to());
-    state.lastPos = rev ? cursor.from() : cursor.to();
+    state.posFrom = cursor.from(); state.posTo = cursor.to();
   })}
   function clearSearch(cm) {cm.operation(function() {
     var state = getSearchState(cm);
@@ -88,7 +89,7 @@
           clearSearch(cm);
           state.query = query;
           state.replacing = text;
-          state.lastPos = cm.getCursor();
+          state.posFrom = state.posTo = cm.getCursor();
           findNext(cm);
         }
       });

lib/util/searchcursor.js

@@ -55,7 +55,7 @@
             return;
           for (;;) {
             if (reverse ? !ln : ln == cm.lineCount() - 1) return;
-            line = fold(getLine(ln += reverse ? -1 : 1).text);
+            line = fold(cm.getLine(ln += reverse ? -1 : 1));
             match = target[reverse ? --idx : ++idx];
             if (idx > 0 && idx < target.length - 1) {
               if (line != match) return;
@@ -91,7 +91,7 @@
         }
         if (reverse) {
           if (!pos.line) return savePosAndFail(0);
-          pos = {line: pos.line-1, ch: getLine(pos.line-1).text.length};
+          pos = {line: pos.line-1, ch: this.cm.getLine(pos.line-1).length};
         }
         else {
           var maxLine = this.cm.lineCount();