Multiple selections

addon/comment/comment.js

@@ -11,8 +11,20 @@
   }
 
   CodeMirror.commands.toggleComment = function(cm) {
-    var from = cm.getCursor("start"), to = cm.getCursor("end");
-    cm.uncomment(from, to) || cm.lineComment(from, to);
+    var prev, selections = [], didSomething;
+    cm.eachSelection(function() {
+      var from = cm.getCursor("start"), to = cm.getCursor("end");
+      if (prev && from.line == prev.line) {
+        if (to.line == prev.line) return;
+        from = {line: prev.line + 1, ch: 0};
+      }
+      didSomething = cm.uncomment(from, to) || didSomething;
+      selections.push([from, to]);
+      prev = to;
+    });
+    if (!didSomething) {
+      for (var i = 0; i < selections.length; i++) cm.lineComment(selections[i][0], selections[i][1]);
+    }
   };
 
   CodeMirror.defineExtension("lineComment", function(from, to, options) {

addon/edit/closebrackets.js

@@ -28,50 +28,58 @@
     var map = {
       name : "autoCloseBrackets",
       Backspace: function(cm) {
-        if (cm.somethingSelected()) return CodeMirror.Pass;
-        var cur = cm.getCursor(), around = charsAround(cm, cur);
-        if (around && pairs.indexOf(around) % 2 == 0)
-          cm.replaceRange("", CodeMirror.Pos(cur.line, cur.ch - 1), CodeMirror.Pos(cur.line, cur.ch + 1));
-        else
-          return CodeMirror.Pass;
+        return cm.withSelection(function(sel) {
+          if (sel.somethingSelected()) return CodeMirror.Pass;
+          var cur = sel.find(), around = charsAround(cm, cur);
+          if (around && pairs.indexOf(around) % 2 == 0)
+            cm.replaceRange("", CodeMirror.Pos(cur.line, cur.ch - 1), CodeMirror.Pos(cur.line, cur.ch + 1));
+          else
+            return CodeMirror.Pass;
+        });
       }
     };
     var closingBrackets = "";
     for (var i = 0; i < pairs.length; i += 2) (function(left, right) {
       if (left != right) closingBrackets += right;
-      function surround(cm) {
-        var selection = cm.getSelection();
-        cm.replaceSelection(left + selection + right);
+      function surround(cm, sel) {
+        var selection = sel.get();
+        sel.replace(left + selection + right);
       }
-      function maybeOverwrite(cm) {
-        var cur = cm.getCursor(), ahead = cm.getRange(cur, CodeMirror.Pos(cur.line, cur.ch + 1));
-        if (ahead != right || cm.somethingSelected()) return CodeMirror.Pass;
+      function maybeOverwrite(cm, sel) {
+        var cur = sel.find(), ahead = cm.getRange(cur, CodeMirror.Pos(cur.line, cur.ch + 1));
+        if (ahead != right || sel.somethingSelected()) return CodeMirror.Pass;
         else cm.execCommand("goCharRight");
       }
       map["'" + left + "'"] = function(cm) {
-        if (left == "'" && cm.getTokenAt(cm.getCursor()).type == "comment")
-          return CodeMirror.Pass;
-        if (cm.somethingSelected()) return surround(cm);
-        if (left == right && maybeOverwrite(cm) != CodeMirror.Pass) return;
-        var cur = cm.getCursor(), ahead = CodeMirror.Pos(cur.line, cur.ch + 1);
-        var line = cm.getLine(cur.line), nextChar = line.charAt(cur.ch);
-        if (line.length == cur.ch || closingBrackets.indexOf(nextChar) >= 0 || SPACE_CHAR_REGEX.test(nextChar))
-          cm.replaceSelection(left + right, {head: ahead, anchor: ahead});
-        else
-          return CodeMirror.Pass;
+        return cm.withSelection(function(sel) {
+          if (left == "'" && cm.getTokenAt(sel.find()).type == "comment")
+            return CodeMirror.Pass;
+          if (sel.somethingSelected()) return surround(cm, sel);
+          if (left == right && maybeOverwrite(cm, sel) != CodeMirror.Pass) return;
+          var cur = sel.find(), ahead = CodeMirror.Pos(cur.line, cur.ch + 1);
+          var line = cm.getLine(cur.line), nextChar = line.charAt(cur.ch);
+          if (line.length == cur.ch || closingBrackets.indexOf(nextChar) >= 0 || SPACE_CHAR_REGEX.test(nextChar))
+            sel.replace(left + right, {head: ahead, anchor: ahead});
+          else
+            return CodeMirror.Pass;
+        });
+      };
+      if (left != right) map["'" + right + "'"] = function(cm) {
+        return cm.withSelection(function(sel) {
+          return maybeOverwrite(cm, sel);
+        });
       };
-      if (left != right) map["'" + right + "'"] = maybeOverwrite;
     })(pairs.charAt(i), pairs.charAt(i + 1));
     return map;
   }
 
   function buildExplodeHandler(pairs) {
     return function(cm) {
-      var cur = cm.getCursor(), around = charsAround(cm, cur);
-      if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
-      cm.operation(function() {
+      return cm.withSelection(function(sel) {
+        var cur = sel.find(), around = charsAround(cm, cur);
+        if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
         var newPos = CodeMirror.Pos(cur.line + 1, 0);
-        cm.replaceSelection("\n\n", {anchor: newPos, head: newPos}, "+input");
+        sel.replace("\n\n", {anchor: newPos, head: newPos}, "+input");
         cm.indentLine(cur.line + 1, null, true);
         cm.indentLine(cur.line + 2, null, true);
       });

addon/edit/closetag.js

@@ -42,39 +42,41 @@
                     "h5", "h6", "head", "html", "iframe", "layer", "legend", "object", "ol", "p", "select", "table", "ul"];
 
   function autoCloseTag(cm, ch) {
-    var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
-    var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-    if (inner.mode.name != "xml") return CodeMirror.Pass;
+    var opt = cm.getOption("autoCloseTags");
+    return cm.withSelection(function(sel) {
+      var pos = sel.find(), tok = cm.getTokenAt(pos);
+      var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
+      if (inner.mode.name != "xml") return CodeMirror.Pass;
 
-    var opt = cm.getOption("autoCloseTags"), html = inner.mode.configuration == "html";
-    var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
-    var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
+      var html = inner.mode.configuration == "html";
+      var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
+      var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
 
-    if (ch == ">" && state.tagName) {
-      var tagName = state.tagName;
-      if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
-      var lowerTagName = tagName.toLowerCase();
-      // Don't process the '>' at the end of an end-tag or self-closing tag
-      if (tok.type == "tag" && state.type == "closeTag" ||
-          tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
-          dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1)
-        return CodeMirror.Pass;
+      if (ch == ">" && state.tagName) {
+        var tagName = state.tagName;
+        if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
+        var lowerTagName = tagName.toLowerCase();
+        // Don't process the '>' at the end of an end-tag or self-closing tag
+        if (tok.type == "tag" && state.type == "closeTag" ||
+            tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
+            dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1)
+          return CodeMirror.Pass;
 
-      var doIndent = indentTags && indexOf(indentTags, lowerTagName) > -1;
-      var curPos = doIndent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1);
-      cm.replaceSelection(">" + (doIndent ? "\n\n" : "") + "</" + tagName + ">",
-                          {head: curPos, anchor: curPos});
-      if (doIndent) {
-        cm.indentLine(pos.line + 1);
-        cm.indentLine(pos.line + 2);
+        var doIndent = indentTags && indexOf(indentTags, lowerTagName) > -1;
+        var curPos = doIndent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1);
+        sel.replace(">" + (doIndent ? "\n\n" : "") + "</" + tagName + ">", {head: curPos, anchor: curPos});
+        if (doIndent) {
+          cm.indentLine(pos.line + 1);
+          cm.indentLine(pos.line + 2);
+        }
+        return;
+      } else if (ch == "/" && tok.string == "<") {
+        var tagName = state.context && state.context.tagName;
+        if (tagName) sel.replace("/" + tagName + ">", "end");
+        return;
       }
-      return;
-    } else if (ch == "/" && tok.string == "<") {
-      var tagName = state.context && state.context.tagName;
-      if (tagName) cm.replaceSelection("/" + tagName + ">", "end");
-      return;
-    }
-    return CodeMirror.Pass;
+      return CodeMirror.Pass;
+    });
   }
 
   function indexOf(collection, elt) {

addon/edit/continuecomment.js

@@ -6,32 +6,34 @@
                                      blockCommentContinue: " * "});
 
   function continueComment(cm) {
-    var pos = cm.getCursor(), token = cm.getTokenAt(pos);
-    var mode = CodeMirror.innerMode(cm.getMode(), token.state).mode;
-    var space;
+    return cm.withSelection(function() {
+      var pos = cm.getCursor(), token = cm.getTokenAt(pos);
+      var mode = CodeMirror.innerMode(cm.getMode(), token.state).mode;
+      var space;
 
-    if (token.type == "comment" && mode.blockCommentStart) {
-      var end = token.string.indexOf(mode.blockCommentEnd);
-      var full = cm.getRange(CodeMirror.Pos(pos.line, 0), CodeMirror.Pos(pos.line, token.end)), found;
-      if (end != -1 && end == token.string.length - mode.blockCommentEnd.length) {
-        // Comment ended, don't continue it
-      } else if (token.string.indexOf(mode.blockCommentStart) == 0) {
-        space = full.slice(0, token.start);
-        if (!/^\s*$/.test(space)) {
-          space = "";
-          for (var i = 0; i < token.start; ++i) space += " ";
+      if (token.type == "comment" && mode.blockCommentStart) {
+        var end = token.string.indexOf(mode.blockCommentEnd);
+        var full = cm.getRange(CodeMirror.Pos(pos.line, 0), CodeMirror.Pos(pos.line, token.end)), found;
+        if (end != -1 && end == token.string.length - mode.blockCommentEnd.length) {
+          // Comment ended, don't continue it
+        } else if (token.string.indexOf(mode.blockCommentStart) == 0) {
+          space = full.slice(0, token.start);
+          if (!/^\s*$/.test(space)) {
+            space = "";
+            for (var i = 0; i < token.start; ++i) space += " ";
+          }
+        } else if ((found = full.indexOf(mode.blockCommentContinue)) != -1 &&
+                   found + mode.blockCommentContinue.length > token.start &&
+                   /^\s*$/.test(full.slice(0, found))) {
+          space = full.slice(0, found);
         }
-      } else if ((found = full.indexOf(mode.blockCommentContinue)) != -1 &&
-                 found + mode.blockCommentContinue.length > token.start &&
-                 /^\s*$/.test(full.slice(0, found))) {
-        space = full.slice(0, found);
       }
-    }
 
-    if (space != null)
-      cm.replaceSelection("\n" + space + mode.blockCommentContinue, "end");
-    else
-      return CodeMirror.Pass;
+      if (space != null)
+        cm.replaceSelection("\n" + space + mode.blockCommentContinue, "end");
+      else
+        return CodeMirror.Pass;
+    });
   }
 
   CodeMirror.defineOption("continueComments", null, function(cm, val, prev) {

addon/edit/continuelist.js

@@ -5,21 +5,23 @@
       unorderedBullets = '*+-';
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
-    var pos = cm.getCursor(),
-        inList = cm.getStateAfter(pos.line).list,
-        match;
+    cm.withSelection(function() {
+      var pos = cm.getCursor(),
+          inList = cm.getStateAfter(pos.line).list,
+          match;
 
-    if (!inList || !(match = cm.getLine(pos.line).match(listRE))) {
-      cm.execCommand('newlineAndIndent');
-      return;
-    }
+      if (!inList || !(match = cm.getLine(pos.line).match(listRE))) {
+        cm.execCommand('newlineAndIndent');
+        return;
+      }
 
-    var indent = match[1], after = match[4];
-    var bullet = unorderedBullets.indexOf(match[2]) >= 0
-      ? match[2]
-      : (parseInt(match[3], 10) + 1) + '.';
+      var indent = match[1], after = match[4];
+      var bullet = unorderedBullets.indexOf(match[2]) >= 0
+        ? match[2]
+        : (parseInt(match[3], 10) + 1) + '.';
 
-    cm.replaceSelection('\n' + indent + bullet + after, 'end');
+      cm.replaceSelection('\n' + indent + bullet + after, 'end');
+    });
   };
 
 }());

addon/edit/matchtags.js

@@ -11,21 +11,25 @@
   function doMatchTags(cm) {
     cm.operation(function() {
       if (cm.state.matchedTags) { cm.state.matchedTags(); cm.state.matchedTags = null; }
-
-      var cur = cm.getCursor();
-      var match = CodeMirror.findMatchingTag(cm, cur) || CodeMirror.findEnclosingTag(cm, cur);
-      if (!match) return;
-      var one = cm.markText(match.open.from, match.open.to, {className: "CodeMirror-matchingbracket"});
-      var two = cm.markText(match.close.from, match.close.to, {className: "CodeMirror-matchingbracket"});
-      cm.state.matchedTags = function() { one.clear(); two.clear(); };
+      var markers = [];
+      cm.withSelection(function(sel) {
+        var cur = sel.find();
+        var match = CodeMirror.findMatchingTag(cm, cur) || CodeMirror.findEnclosingTag(cm, cur);
+        if (!match) return;
+        markers.push(cm.markText(match.open.from, match.open.to, {className: "CodeMirror-matchingbracket"}));
+        markers.push(cm.markText(match.close.from, match.close.to, {className: "CodeMirror-matchingbracket"}));
+      });
+      cm.state.matchedTags = function() { for (var i = 0; i < markers.length; i++) markers[i].clear(); };
     });
   }
 
   CodeMirror.commands.toMatchingTag = function(cm) {
-    var found = CodeMirror.findMatchingTag(cm, cm.getCursor());
-    if (found) {
-      var other = found.at == "close" ? found.open : found.close;
-      cm.setSelection(other.to, other.from);
-    }
+    cm.withSelection(function(sel) {
+      var found = CodeMirror.findMatchingTag(cm, sel.find());
+      if (found) {
+        var other = found.at == "close" ? found.open : found.close;
+        sel.move(other.to, other.from);
+      }
+    });
   };
 })();

addon/hint/show-hint.js

@@ -1,6 +1,8 @@
 (function() {
   "use strict";
 
+  function posLess(a, b) {return a.line < b.line || (a.line == b.line && a.ch < b.ch);}
+
   CodeMirror.showHint = function(cm, getHints, options) {
     // We want a single cursor position.
     if (cm.somethingSelected()) return;
@@ -39,7 +41,18 @@
     pick: function(data, i) {
       var completion = data.list[i];
       if (completion.hint) completion.hint(this.cm, data, completion);
-      else this.cm.replaceRange(getText(completion), data.from, data.to);
+      else {
+        var context = this.cm.getRange(data.from, data.to);
+        var cursor = this.cm.getCursor();
+        var pre = posLess(data.from, cursor) ? -this.cm.getRange(data.from, cursor).length : this.cm.getRange(cursor, data.from).length;
+        var post = posLess(cursor, data.to) ? this.cm.getRange(cursor, data.to).length : -this.cm.getRange(data.to, cursor).length;
+        this.cm.eachSelection(function(sel) {
+          var cursor = sel.find();
+          var from = this.findPosH(cursor, pre, "char");
+          var to = this.findPosH(cursor, post, "char");
+          if(this.getRange(from, to) == context) this.replaceRange(getText(completion), from, to);
+        });
+      }
       this.close();
     },
 

addon/search/match-highlighter.js

@@ -24,14 +24,15 @@
     }
     if (this.style == null) this.style = DEFAULT_TOKEN_STYLE;
     if (this.minChars == null) this.minChars = DEFAULT_MIN_CHARS;
-    this.overlay = this.timeout = null;
+    this.overlays = [];
+    this.timeout = null;
   }
 
   CodeMirror.defineOption("highlightSelectionMatches", false, function(cm, val, old) {
     if (old && old != CodeMirror.Init) {
-      var over = cm.state.matchHighlighter.overlay;
-      if (over) cm.removeOverlay(over);
-      clearTimeout(cm.state.matchHighlighter.timeout);
+      var state = cm.state.matchHighlighter;
+      for (var i = 0; i < state.overlays.length; i++) cm.removeOverlay(state.overlays[i]);
+      clearTimeout(state.timeout);
       cm.state.matchHighlighter = null;
       cm.off("cursorActivity", cursorActivity);
     }
@@ -51,21 +52,20 @@
   function highlightMatches(cm) {
     cm.operation(function() {
       var state = cm.state.matchHighlighter;
-      if (state.overlay) {
-        cm.removeOverlay(state.overlay);
-        state.overlay = null;
-      }
-
-      if (!cm.somethingSelected() && state.showToken) {
-        var tok = cm.getTokenAt(cm.getCursor()).string;
-        if (/\w/.test(tok))
-          cm.addOverlay(state.overlay = makeOverlay(tok, true, state.style));
-        return;
-      }
-      if (cm.getCursor("head").line != cm.getCursor("anchor").line) return;
-      var selection = cm.getSelection().replace(/^\s+|\s+$/g, "");
-      if (selection.length >= state.minChars)
-        cm.addOverlay(state.overlay = makeOverlay(selection, false, state.style));
+      for (var i = 0; i < state.overlays.length; i++) cm.removeOverlay(state.overlays[i]);
+      state.overlays = [];
+      cm.withSelection(function(sel) {
+        if (!sel.somethingSelected() && state.showToken) {
+          var tok = cm.getTokenAt(sel.find()).string;
+          if (/\w/.test(tok))
+            cm.addOverlay(state.overlays[state.overlays.length] = makeOverlay(tok, true, state.style));
+          return;
+        }
+        if (sel.find().line != sel.anchor.line) return;
+        var selection = sel.get().replace(/^\s+|\s+$/g, "");
+        if (selection.length >= state.minChars)
+          cm.addOverlay(state.overlays[state.overlays.length] = makeOverlay(selection, false, state.style));
+      });
     });
   }