AUTHORS

@@ -18,8 +18,10 @@ Alexander Schepanovski
 Alexander Solovyov
 alexey-k
 Alex Piggott
+Amsul
 Amy
 Ananya Sen
+anaran
 AndersMad
 Anderson Mesquita
 Andre von Houck
@@ -42,6 +44,9 @@ benbro
 Beni Cherniavsky-Paskin
 Benjamin DeCoste
 Ben Keen
+Bernhard Sirlinger
+Billy Moon
+Blaine G
 boomyjee
 borawjm
 Brandon Frohs
@@ -53,11 +58,13 @@ Chandra Sekhar Pydi
 Charles Skelton
 Chris Coyier
 Chris Granger
+Chris Houseknecht
 Chris Morgan
 Christopher Brown
 ciaranj
 CodeAnimal
 ComFreek
+Curtis Gagliardi
 dagsta
 Dan Heberden
 Daniel, Dao Quang Minh
@@ -72,6 +79,7 @@ David Mignot
 David Pathakjee
 deebugger
 Deep Thought
+domagoj412
 Dominator008
 Domizio Demichelis
 Drew Bratcher
@@ -85,6 +93,7 @@ ekhaled
 Enam Mijbah Noor
 Eric Allam
 eustas
+Fabien O'Carroll
 Fabio Zendhi Nagao
 Fauntleroy
 fbuchinger
@@ -96,13 +105,15 @@ flack
 ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
+Frank Wiegand
 Gabriel Nahmias
 galambalazs
 Gautam Mehta
 Glenn Jorde
 Glenn Ruehle
 Golevka
 Gordon Smith
+Grant Skinner
 greengiant
 Guillaume Massé
 Guillaume Massé
@@ -122,6 +133,7 @@ Ingo Richter
 Irakli Gozalishvili
 Ivan Kurnosov
 Jacob Lee
+Jakob Miland
 Jakub Vrana
 James Campos
 James Thorne
@@ -146,6 +158,7 @@ John Connor
 John Lees-Miller
 John Snelson
 John Van Der Loo
+Jonathan Malmaud
 jongalloway
 Jon Malmaud
 Joost-Wim Boekesteijn
@@ -179,8 +192,10 @@ Luciano Longo
 lynschinzer
 Maksim Lin
 Maksym Taran
+Manuel Rego Casasnovas
 Marat Dreizin
 Marco Aurélio
+Marco Munizaga
 Marijn Haverbeke
 Mario Pietsch
 Mark Lentczner
@@ -216,10 +231,14 @@ Miraculix87
 misfo
 mloginov
 mps
+mtaran-google
 Narciso Jaramillo
 Nathan Williams
+ndr
 nerbert
+nextrevision
 nguillaumin
+Nicholas Bollweg
 Niels van Groningen
 Nikita Beloglazov
 Nikita Vasilyev
@@ -240,10 +259,12 @@ prasanthj
 Prasanth J
 Rahul
 Randy Edmunds
+Rasmus Erik Voel Jensen
 Richard Z.H. Wang
 robertop23
 Robert Plummer
 Ruslan Osmanov
+Ryan Prior
 sabaca
 Samuel Ainsworth
 sandeepshetty
@@ -256,6 +277,7 @@ Sebastian Zaha
 shaund
 shaun gilchrist
 Shawn A
+sheopory
 Shiv Deepak
 Shmuel Englard
 soliton4
@@ -284,6 +306,7 @@ Tom Erik Støwer
 Tom MacWright
 Tony Jian
 Travis Heppe
+Triangle717
 Vestimir Markov
 vf
 Volker Mische

addon/comment/continuecomment.js

@@ -1,5 +1,6 @@
 (function() {
   var modes = ["clike", "css", "javascript"];
+
   for (var i = 0; i < modes.length; ++i)
     CodeMirror.extendMode(modes[i], {blockCommentContinue: " * "});
 
@@ -12,7 +13,7 @@
     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) {
+      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);
@@ -27,7 +28,7 @@
       }
       if (insert != null) insert += mode.blockCommentContinue;
     }
-    if (insert == null && mode.lineComment) {
+    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);
@@ -42,12 +43,24 @@
       return CodeMirror.Pass;
   }
 
+  function continueLineCommentEnabled(cm) {
+    var opt = cm.getOption("continueComments");
+    if (opt && typeof opt == "object")
+      return opt.continueLineComment !== false;
+    return true;
+  }
+
   CodeMirror.defineOption("continueComments", null, function(cm, val, prev) {
     if (prev && prev != CodeMirror.Init)
       cm.removeKeyMap("continueComment");
     if (val) {
+      var key = "Enter";
+      if (typeof val == "string")
+        key = val;
+      else if (typeof val == "object" && val.key)
+        key = val.key;
       var map = {name: "continueComment"};
-      map[typeof val == "string" ? val : "Enter"] = continueComment;
+      map[key] = continueComment;
       cm.addKeyMap(map);
     }
   });

addon/dialog/dialog.js

@@ -39,6 +39,7 @@
       CodeMirror.on(inp, "keydown", function(e) {
         if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
         if (e.keyCode == 13 || e.keyCode == 27) {
+          inp.blur();
           CodeMirror.e_stop(e);
           close();
           me.focus();

addon/display/rulers.js

@@ -0,0 +1,47 @@
+(function() {
+  "use strict";
+
+  CodeMirror.defineOption("rulers", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      clearRulers(cm);
+      cm.off("refresh", refreshRulers);
+    }
+    if (val && val.length) {
+      setRulers(cm);
+      cm.on("refresh", refreshRulers);
+    }
+  });
+
+  function clearRulers(cm) {
+    for (var i = cm.display.lineSpace.childNodes.length - 1; i >= 0; i--) {
+      var node = cm.display.lineSpace.childNodes[i];
+      if (/(^|\s)CodeMirror-ruler($|\s)/.test(node.className))
+        node.parentNode.removeChild(node);
+    }
+  }
+
+  function setRulers(cm) {
+    var val = cm.getOption("rulers");
+    var cw = cm.defaultCharWidth();
+    var left = cm.charCoords(CodeMirror.Pos(cm.firstLine(), 0), "div").left;
+    var bot = -cm.display.scroller.offsetHeight;
+    for (var i = 0; i < val.length; i++) {
+      var elt = document.createElement("div");
+      var col, cls = null;
+      if (typeof val[i] == "number") {
+        col = val[i];
+      } else {
+        col = val[i].column;
+        cls = val[i].className;
+      }
+      elt.className = "CodeMirror-ruler" + (cls ? " " + cls : "");
+      elt.style.cssText = "left: " + (left + col * cw) + "px; top: -50px; bottom: " + bot + "px";
+      cm.display.lineSpace.insertBefore(elt, cm.display.cursorDiv);
+    }
+  }
+
+  function refreshRulers(cm) {
+    clearRulers(cm);
+    setRulers(cm);
+  }
+})();

addon/edit/closetag.js

@@ -82,6 +82,7 @@
 
     var tagName = state.context && state.context.tagName;
     if (tagName) cm.replaceSelection("/" + tagName + ">", "end");
+    else return CodeMirror.Pass;
   }
 
   function indexOf(collection, elt) {

addon/fold/foldcode.js

@@ -62,6 +62,12 @@
     doFold(this, pos, options, force);
   });
 
+  CodeMirror.defineExtension("isFolded", function(pos) {
+    var marks = this.findMarksAt(pos);
+    for (var i = 0; i < marks.length; ++i)
+      if (marks[i].__isFold) return true;
+  });
+
   CodeMirror.commands.fold = function(cm) {
     cm.foldCode(cm.getCursor());
   };

addon/fold/markdown-fold.js

@@ -0,0 +1,34 @@
+CodeMirror.registerHelper("fold", "markdown", function(cm, start) {
+  var maxDepth = 100;
+
+  function isHeader(lineNo) {
+    var tokentype = cm.getTokenTypeAt(CodeMirror.Pos(lineNo, 0));
+    return tokentype && /\bheader\b/.test(tokentype);
+  }
+
+  function headerLevel(lineNo, line, nextLine) {
+    var match = line && line.match(/^#+/);
+    if (match && isHeader(lineNo)) return match[0].length;
+    match = nextLine && nextLine.match(/^[=\-]+\s*$/);
+    if (match && isHeader(lineNo + 1)) return nextLine[0] == "=" ? 1 : 2;
+    return maxDepth;
+  }
+
+  var firstLine = cm.getLine(start.line), nextLine = cm.getLine(start.line + 1);
+  var level = headerLevel(start.line, firstLine, nextLine);
+  if (level === maxDepth) return undefined;
+
+  var lastLineNo = cm.lastLine();
+  var end = start.line, nextNextLine = cm.getLine(end + 2);
+  while (end < lastLineNo) {
+    if (headerLevel(end + 1, nextLine, nextNextLine) <= level) break;
+    ++end;
+    nextLine = nextNextLine;
+    nextNextLine = cm.getLine(end + 2);
+  }
+
+  return {
+    from: CodeMirror.Pos(start.line, firstLine.length),
+    to: CodeMirror.Pos(end, cm.getLine(end).length)
+  };
+});

addon/hint/anyword-hint.js

@@ -15,8 +15,8 @@
     var list = [], seen = {};
     var re = new RegExp(word.source, "g");
     for (var dir = -1; dir <= 1; dir += 2) {
-      var line = cur.line, end = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
-      for (; line != end; line += dir) {
+      var line = cur.line, endLine = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
+      for (; line != endLine; line += dir) {
         var text = editor.getLine(line), m;
         while (m = re.exec(text)) {
           if (line == cur.line && m[0] === curWord) continue;

addon/hint/show-hint.js

@@ -46,7 +46,7 @@
     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 this.cm.replaceRange(getText(completion), completion.from||data.from, completion.to||data.to);
       CodeMirror.signal(data, "pick", completion);
       this.close();
     },
@@ -193,34 +193,40 @@
     var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
     var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
     (options.container || document.body).appendChild(hints);
-    var box = hints.getBoundingClientRect();
-    var overlapX = box.right - winW, overlapY = box.bottom - winH;
+    var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
+    if (overlapY > 0) {
+      var height = box.bottom - box.top, curTop = box.top - (pos.bottom - pos.top);
+      if (curTop - height > 0) { // Fits above cursor
+        hints.style.top = (top = curTop - height) + "px";
+        below = false;
+      } else if (height > winH) {
+        hints.style.height = (winH - 5) + "px";
+        hints.style.top = (top = pos.bottom - box.top) + "px";
+        var cursor = cm.getCursor();
+        if (data.from.ch != cursor.ch) {
+          pos = cm.cursorCoords(cursor);
+          hints.style.left = (left = pos.left) + "px";
+          box = hints.getBoundingClientRect();
+        }
+      }
+    }
+    var overlapX = box.left - winW;
     if (overlapX > 0) {
       if (box.right - box.left > winW) {
         hints.style.width = (winW - 5) + "px";
         overlapX -= (box.right - box.left) - winW;
       }
       hints.style.left = (left = pos.left - overlapX) + "px";
     }
-    if (overlapY > 0) {
-      var height = box.bottom - box.top;
-      if (box.top - (pos.bottom - pos.top) - height > 0) {
-        overlapY = height + (pos.bottom - pos.top);
-        below = false;
-      } else if (height > winH) {
-        hints.style.height = (winH - 5) + "px";
-        overlapY -= height - winH;
-      }
-      hints.style.top = (top = pos.bottom - overlapY) + "px";
-    }
 
     cm.addKeyMap(this.keyMap = buildKeyMap(options, {
       moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },
       setFocus: function(n) { widget.changeActive(n); },
       menuSize: function() { return widget.screenAmount(); },
       length: completions.length,
       close: function() { completion.close(); },
-      pick: function() { widget.pick(); }
+      pick: function() { widget.pick(); },
+      data: data
     }));
 
     if (options.closeOnUnfocus !== false) {
@@ -303,15 +309,16 @@
   };
 
   CodeMirror.registerHelper("hint", "auto", function(cm, options) {
-    var helpers = cm.getHelpers(cm.getCursor(), "hint");
+    var helpers = cm.getHelpers(cm.getCursor(), "hint"), words;
     if (helpers.length) {
       for (var i = 0; i < helpers.length; i++) {
         var cur = helpers[i](cm, options);
         if (cur && cur.list.length) return cur;
       }
-    } else {
-      var words = cm.getHelper(cm.getCursor(), "hintWords");
+    } else if (words = cm.getHelper(cm.getCursor(), "hintWords")) {
       if (words) return CodeMirror.hint.fromList(cm, {words: words});
+    } else if (CodeMirror.hint.anyword) {
+      return CodeMirror.hint.anyword(cm, options);
     }
   });