DevTools: roll CodeMirror to v4.0.3

Source/devtools/front_end/cm/markselection.js

 // Because sometimes you need to mark the selected *text*.
 //
 // Adds an option 'styleSelectedText' which, when enabled, gives
 // selected text the CSS class given as option value, or
 // "CodeMirror-selectedtext" when the value is not a string.
 
-(function() {
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
   "use strict";
 
   CodeMirror.defineOption("styleSelectedText", false, function(cm, val, old) {
     var prev = old && old != CodeMirror.Init;
     if (val && !prev) {
       cm.state.markedSelection = [];
       cm.state.markedSelectionStyle = typeof val == "string" ? val : "CodeMirror-selectedtext";
       reset(cm);
       cm.on("cursorActivity", onCursorActivity);
       cm.on("change", onChange);
     } else if (!val && prev) {
       cm.off("cursorActivity", onCursorActivity);
       cm.off("change", onChange);
       clear(cm);
       cm.state.markedSelection = cm.state.markedSelectionStyle = null;
     }
   });
 
   function onCursorActivity(cm) {
     cm.operation(function() { update(cm); });
   }
 
   function onChange(cm) {
     if (cm.state.markedSelection.length)
       cm.operation(function() { clear(cm); });
   }
 
   var CHUNK_SIZE = 8;
   var Pos = CodeMirror.Pos;
-
-  function cmp(pos1, pos2) {
-    return pos1.line - pos2.line || pos1.ch - pos2.ch;
-  }
+  var cmp = CodeMirror.cmpPos;
 
   function coverRange(cm, from, to, addAt) {
     if (cmp(from, to) == 0) return;
     var array = cm.state.markedSelection;
     var cls = cm.state.markedSelectionStyle;
     for (var line = from.line;;) {
       var start = line == from.line ? from : Pos(line, 0);
       var endLine = line + CHUNK_SIZE, atEnd = endLine >= to.line;
       var end = atEnd ? to : Pos(endLine, 0);
       var mark = cm.markText(start, end, {className: cls});
       if (addAt == null) array.push(mark);
       else array.splice(addAt++, 0, mark);
       if (atEnd) break;
       line = endLine;
     }
   }
 
   function clear(cm) {
     var array = cm.state.markedSelection;
     for (var i = 0; i < array.length; ++i) array[i].clear();
     array.length = 0;
   }
 
   function reset(cm) {
     clear(cm);
-    var from = cm.getCursor("start"), to = cm.getCursor("end");
-    coverRange(cm, from, to);
+    var ranges = cm.listSelections();
+    for (var i = 0; i < ranges.length; i++)
+      coverRange(cm, ranges[i].from(), ranges[i].to());
   }
 
   function update(cm) {
+    if (!cm.somethingSelected()) return clear(cm);
+    if (cm.listSelections().length > 1) return reset(cm);
+
     var from = cm.getCursor("start"), to = cm.getCursor("end");
-    if (cmp(from, to) == 0) return clear(cm);
 
     var array = cm.state.markedSelection;
     if (!array.length) return coverRange(cm, from, to);
 
     var coverStart = array[0].find(), coverEnd = array[array.length - 1].find();
     if (!coverStart || !coverEnd || to.line - from.line < CHUNK_SIZE ||
         cmp(from, coverEnd.to) >= 0 || cmp(to, coverStart.from) <= 0)
       return reset(cm);
 
     while (cmp(from, coverStart.from) > 0) {
@@ skipping 15 matching lines @@
     }
     if (cmp(to, coverEnd.to) > 0) {
       if (to.line - coverEnd.from.line < CHUNK_SIZE) {
         array.pop().clear();
         coverRange(cm, coverEnd.from, to);
       } else {
         coverRange(cm, coverEnd.to, to);
       }
     }
   }
-})();
+});