AUTHORS

@@ -3,14 +3,17 @@ List of CodeMirror contributors. Updated before every release.
 4r2r
 Aaron Brooks
 Abe Fettig
+Adam Ahmed
 Adam King
 adanlobato
 Adán Lobato
+Adrian Aichner
 aeroson
 Ahmad Amireh
 Ahmad M. Zawawi
 ahoward
 Akeksandr Motsjonov
+Alberto González Palomo
 Alberto Pose
 Albert Xing
 Alexander Pavlov
@@ -46,6 +49,8 @@ Benjamin DeCoste
 Ben Keen
 Bernhard Sirlinger
 Billy Moon
+binny
+B Krishna Chaitanya
 Blaine G
 boomyjee
 borawjm
@@ -79,6 +84,7 @@ David Mignot
 David Pathakjee
 deebugger
 Deep Thought
+dignifiedquire
 domagoj412
 Dominator008
 Domizio Demichelis
@@ -106,6 +112,7 @@ ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
 Frank Wiegand
+Gabriel Horner
 Gabriel Nahmias
 galambalazs
 Gautam Mehta
@@ -192,6 +199,7 @@ Luciano Longo
 lynschinzer
 Maksim Lin
 Maksym Taran
+Malay Majithia
 Manuel Rego Casasnovas
 Marat Dreizin
 Marco Aurélio
@@ -238,6 +246,7 @@ ndr
 nerbert
 nextrevision
 nguillaumin
+Ng Zhi An
 Nicholas Bollweg
 Niels van Groningen
 Nikita Beloglazov
@@ -246,6 +255,7 @@ Nikolay Kostov
 nlwillia
 pablo
 Page
+Patil Arpith
 Patrick Strawderman
 Paul Garvin
 Paul Ivanov
@@ -283,6 +293,7 @@ Shmuel Englard
 soliton4
 sonson
 spastorelli
+srajanpaliwal
 Stanislav Oaserele
 Stas Kobzar
 Stefan Borsje
@@ -307,6 +318,7 @@ Tom MacWright
 Tony Jian
 Travis Heppe
 Triangle717
+twifkak
 Vestimir Markov
 vf
 Volker Mische

addon/comment/comment.js

@@ -1,4 +1,11 @@
-(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";
 
   var noOptions = {};
@@ -11,8 +18,21 @@
   }
 
   CodeMirror.commands.toggleComment = function(cm) {
-    var from = cm.getCursor("start"), to = cm.getCursor("end");
-    cm.uncomment(from, to) || cm.lineComment(from, to);
+    var minLine = Infinity, ranges = cm.listSelections(), mode = null;
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var from = ranges[i].from(), to = ranges[i].to();
+      if (from.line >= minLine) continue;
+      if (to.line >= minLine) to = Pos(minLine, 0);
+      minLine = from.line;
+      if (mode == null) {
+        if (cm.uncomment(from, to)) mode = "un";
+        else { cm.lineComment(from, to); mode = "line"; }
+      } else if (mode == "un") {
+        cm.uncomment(from, to);
+      } else {
+        cm.lineComment(from, to);
+      }
+    }
   };
 
   CodeMirror.defineExtension("lineComment", function(from, to, options) {
@@ -146,4 +166,4 @@
     });
     return true;
   });
-})();
+});

addon/comment/continuecomment.js

@@ -1,46 +1,61 @@
-(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) {
   var modes = ["clike", "css", "javascript"];
 
   for (var i = 0; i < modes.length; ++i)
     CodeMirror.extendMode(modes[i], {blockCommentContinue: " * "});
 
   function continueComment(cm) {
-    var pos = cm.getCursor(), token = cm.getTokenAt(pos);
-    if (token.type != "comment" || cm.getOption("disableInput")) return CodeMirror.Pass;
-    var mode = CodeMirror.innerMode(cm.getMode(), token.state).mode;
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+    var ranges = cm.listSelections(), mode, inserts = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var pos = ranges[i].head, token = cm.getTokenAt(pos);
+      if (token.type != "comment") return CodeMirror.Pass;
+      var modeHere = CodeMirror.innerMode(cm.getMode(), token.state).mode;
+      if (!mode) mode = modeHere;
+      else if (mode != modeHere) return CodeMirror.Pass;
 
-    var insert;
-    if (mode.blockCommentStart && mode.blockCommentContinue) {
-      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 && pos.ch >= end) {
-        // Comment ended, don't continue it
-      } else if (token.string.indexOf(mode.blockCommentStart) == 0) {
-        insert = full.slice(0, token.start);
-        if (!/^\s*$/.test(insert)) {
-          insert = "";
-          for (var i = 0; i < token.start; ++i) insert += " ";
+      var insert = null;
+      if (mode.blockCommentStart && mode.blockCommentContinue) {
+        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 && pos.ch >= end) {
+          // Comment ended, don't continue it
+        } else if (token.string.indexOf(mode.blockCommentStart) == 0) {
+          insert = full.slice(0, token.start);
+          if (!/^\s*$/.test(insert)) {
+            insert = "";
+            for (var j = 0; j < token.start; ++j) insert += " ";
+          }
+        } else if ((found = full.indexOf(mode.blockCommentContinue)) != -1 &&
+                   found + mode.blockCommentContinue.length > token.start &&
+                   /^\s*$/.test(full.slice(0, found))) {
+          insert = full.slice(0, found);
         }
-      } else if ((found = full.indexOf(mode.blockCommentContinue)) != -1 &&
-                 found + mode.blockCommentContinue.length > token.start &&
-                 /^\s*$/.test(full.slice(0, found))) {
-        insert = full.slice(0, found);
+        if (insert != null) insert += mode.blockCommentContinue;
       }
-      if (insert != null) insert += mode.blockCommentContinue;
-    }
-    if (insert == null && mode.lineComment && continueLineCommentEnabled(cm)) {
-      var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
-      if (found > -1) {
-        insert = line.slice(0, found);
-        if (/\S/.test(insert)) insert = null;
-        else insert += mode.lineComment + line.slice(found + mode.lineComment.length).match(/^\s*/)[0];
+      if (insert == null && mode.lineComment && continueLineCommentEnabled(cm)) {
+        var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
+        if (found > -1) {
+          insert = line.slice(0, found);
+          if (/\S/.test(insert)) insert = null;
+          else insert += mode.lineComment + line.slice(found + mode.lineComment.length).match(/^\s*/)[0];
+        }
       }
+      if (insert == null) return CodeMirror.Pass;
+      inserts[i] = "\n" + insert;
     }
 
-    if (insert != null)
-      cm.replaceSelection("\n" + insert, "end");
-    else
-      return CodeMirror.Pass;
+    cm.operation(function() {
+      for (var i = ranges.length - 1; i >= 0; i--)
+        cm.replaceRange(inserts[i], ranges[i].from(), ranges[i].to(), "+insert");
+    });
   }
 
   function continueLineCommentEnabled(cm) {
@@ -64,4 +79,4 @@
       cm.addKeyMap(map);
     }
   });
-})();
+});

addon/dialog/dialog.js

@@ -1,6 +1,13 @@
 // Open simple dialogs on top of an editor. Relies on dialog.css.
 
-(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) {
   function dialogDiv(cm, template, bottom) {
     var wrap = cm.getWrapperElement();
     var dialog;
@@ -120,4 +127,4 @@
     if (duration)
       doneTimer = setTimeout(close, options.duration);
   });
-})();
+});

addon/display/fullscreen.js

@@ -1,4 +1,11 @@
-(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("fullScreen", false, function(cm, val, old) {
@@ -28,4 +35,4 @@
     window.scrollTo(info.scrollLeft, info.scrollTop);
     cm.refresh();
   }
-})();
+});

addon/display/placeholder.js

@@ -1,4 +1,11 @@
-(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) {
   CodeMirror.defineOption("placeholder", "", function(cm, val, old) {
     var prev = old && old != CodeMirror.Init;
     if (val && !prev) {
@@ -45,4 +52,4 @@
   function isEmpty(cm) {
     return (cm.lineCount() === 1) && (cm.getLine(0) === "");
   }
-})();
+});

addon/display/rulers.js

@@ -1,4 +1,11 @@
-(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("rulers", false, function(cm, val, old) {
@@ -44,4 +51,4 @@
     clearRulers(cm);
     setRulers(cm);
   }
-})();
+});