Bump version number post-3.20

[the-matrix theme] Fix broken CSS selector, tune down selection contr…
…ast.
…ast.
codemirror · marijnh · NikolayIT · marijnh · marijnh · cben
diff --git a/AUTHORS b/AUTHORS
@@ -2,6 +2,7 @@ List of CodeMirror contributors. Updated before every release.
 
 4r2r
 Aaron Brooks
+Abe Fettig
 Adam King
 adanlobato
 Adán Lobato
@@ -10,33 +11,41 @@ Ahmad Amireh
 Ahmad M. Zawawi
 ahoward
 Akeksandr Motsjonov
+Alberto Pose
 Albert Xing
 Alexander Pavlov
 Alexander Schepanovski
+Alexander Solovyov
 alexey-k
 Alex Piggott
 Amy
 Ananya Sen
 AndersMad
+Anderson Mesquita
 Andre von Houck
 Andrey Lushnikov
+Andy Joslin
 Andy Kimball
 Andy Li
 angelozerr
 angelo.zerr@gmail.com
 Ankit Ahuja
 Ansel Santosa
 Anthony Grimes
+Anton Kovalyov
 areos
+AtomicPages LLC
 Atul Bhouraskar
 Aurelian Oancea
 Bastian Müller
 benbro
+Beni Cherniavsky-Paskin
 Benjamin DeCoste
 Ben Keen
 boomyjee
 borawjm
 Brandon Frohs
+Brandon Wamboldt
 Brett Zamir
 Brian Sletten
 Bruce Mitchener
@@ -54,9 +63,11 @@ Dan Heberden
 Daniel, Dao Quang Minh
 Daniel Faust
 Daniel Huigens
+Daniel KJ
 Daniel Neel
 Daniel Parnell
 Danny Yoo
+Darius Roberts
 David Mignot
 David Pathakjee
 deebugger
@@ -68,10 +79,13 @@ Drew Hintz
 Drew Khoury
 Dror BG
 duralog
+eborden
 edsharp
 ekhaled
+Enam Mijbah Noor
 Eric Allam
 eustas
+Fabio Zendhi Nagao
 Fauntleroy
 fbuchinger
 feizhang365
@@ -80,6 +94,7 @@ Felix Raab
 Filip Noetzel
 flack
 ForbesLindesay
+Forbes Lindesay
 Ford_Lawnmower
 Gabriel Nahmias
 galambalazs
@@ -94,12 +109,15 @@ Guillaume Massé
 Hans Engel
 Hardest
 Hasan Karahan
+hitsthings
 Hocdoc
 Ian Beck
+Ian Dickinson
 Ian Wehrman
 Ian Wetherbee
 Ice White
 ICHIKAWA, Yuji
+ilvalle
 Ingo Richter
 Irakli Gozalishvili
 Ivan Kurnosov
@@ -111,6 +129,7 @@ Jamie Hill
 Jan Jongboom
 jankeromnes
 Jan Keromnes
+Jan Odvarko
 Jan T. Sott
 Jason
 Jason Grout
@@ -122,16 +141,21 @@ jeffkenton
 Jeff Pickhardt
 jem (graphite)
 Jochen Berger
+Johan Ask
 John Connor
 John Lees-Miller
 John Snelson
+John Van Der Loo
 jongalloway
+Jon Malmaud
 Joost-Wim Boekesteijn
 Joseph Pecoraro
 Joshua Newman
 jots
+jsoojeon
 Juan Benavides Romero
 Jucovschi Constantin
+Juho Vuori
 jwallers@gmail.com
 kaniga
 Ken Newman
@@ -145,11 +169,13 @@ koops
 ks-ifware
 kubelsmieci
 Lanny
+Laszlo Vidacs
 leaf corcoran
 Leonya Khachaturov
 Liam Newman
 LM
 Lorenzo Stoakes
+Luciano Longo
 lynschinzer
 Maksim Lin
 Maksym Taran
@@ -158,8 +184,10 @@ Marco Aurélio
 Marijn Haverbeke
 Mario Pietsch
 Mark Lentczner
+Marko Bonaci
 Martin Balek
 Martín Gaitán
+Martin Hasoň
 Mason Malone
 Mateusz Paprocki
 mats cronqvist
@@ -169,6 +197,7 @@ Matt McDonald
 Matt Pass
 Matt Sacks
 Maximilian Hils
+Maxim Kraev
 Max Kirsch
 mbarkhau
 Metatheos
@@ -183,7 +212,9 @@ Mike Diaz
 Mike Ivanov
 Mike Kadin
 MinRK
+Miraculix87
 misfo
+mloginov
 mps
 Narciso Jaramillo
 Nathan Williams
@@ -192,13 +223,15 @@ nguillaumin
 Niels van Groningen
 Nikita Beloglazov
 Nikita Vasilyev
+Nikolay Kostov
 nlwillia
 pablo
 Page
 Patrick Strawderman
 Paul Garvin
 Paul Ivanov
 Pavel Feldman
+Pavel Strashkin
 Paweł Bartkiewicz
 peteguhl
 peterkroon
@@ -219,16 +252,22 @@ Sascha Peilicke
 satchmorun
 sathyamoorthi
 SCLINIC\jdecker
+Sebastian Zaha
 shaund
 shaun gilchrist
+Shawn A
+Shiv Deepak
 Shmuel Englard
+soliton4
 sonson
 spastorelli
+Stanislav Oaserele
 Stas Kobzar
 Stefan Borsje
 Steffen Beyer
 Steve O'Hara
 stoskov
+Taha Jahangir
 Tarmil
 tfjgeorge
 Thaddee Tyl
@@ -244,12 +283,18 @@ Tomas Varaneckas
 Tom Erik Støwer
 Tom MacWright
 Tony Jian
+Travis Heppe
 Vestimir Markov
 vf
 Volker Mische
+wenli
+Wesley Wiser
 William Jamieson
 Wojtek Ptak
 Xavier Mendez
+YNH Webdev
 Yunchi Luo
 Yuvi Panda
 Zachary Dremann
+zziuni
+魏鹏刚
diff --git a/addon/comment/comment.js b/addon/comment/comment.js
@@ -96,8 +96,9 @@
       for (var i = start; i <= end; ++i) {
         var line = self.getLine(i);
         var found = line.indexOf(lineString);
+        if (found > -1 && !/comment/.test(self.getTokenTypeAt(Pos(i, found + 1)))) found = -1;
         if (found == -1 && (i != end || i == start) && nonWS.test(line)) break lineComment;
-        if (i != start && found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
+        if (found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
         lines.push(line);
       }
       self.operation(function() {
@@ -124,7 +125,10 @@
       endLine = self.getLine(--end);
       close = endLine.lastIndexOf(endString);
     }
-    if (open == -1 || close == -1) return false;
+    if (open == -1 || close == -1 ||
+        !/comment/.test(self.getTokenTypeAt(Pos(start, open + 1))) ||
+        !/comment/.test(self.getTokenTypeAt(Pos(end, close + 1))))
+      return false;
 
     self.operation(function() {
       self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),
diff --git a/addon/comment/continuecomment.js b/addon/comment/continuecomment.js
@@ -5,7 +5,7 @@
 
   function continueComment(cm) {
     var pos = cm.getCursor(), token = cm.getTokenAt(pos);
-    if (token.type != "comment") return CodeMirror.Pass;
+    if (token.type != "comment" || cm.getOption("disableInput")) return CodeMirror.Pass;
     var mode = CodeMirror.innerMode(cm.getMode(), token.state).mode;
 
     var insert;
diff --git a/addon/dialog/dialog.js b/addon/dialog/dialog.js
@@ -35,6 +35,7 @@
     }
     var inp = dialog.getElementsByTagName("input")[0], button;
     if (inp) {
+      if (options && options.value) inp.value = options.value;
       CodeMirror.on(inp, "keydown", function(e) {
         if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
         if (e.keyCode == 13 || e.keyCode == 27) {
diff --git a/addon/edit/closebrackets.js b/addon/edit/closebrackets.js
@@ -28,7 +28,7 @@
     var map = {
       name : "autoCloseBrackets",
       Backspace: function(cm) {
-        if (cm.somethingSelected()) return CodeMirror.Pass;
+        if (cm.somethingSelected() || cm.getOption("disableInput")) 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));
@@ -49,7 +49,8 @@
         else cm.execCommand("goCharRight");
       }
       map["'" + left + "'"] = function(cm) {
-        if (left == "'" && cm.getTokenAt(cm.getCursor()).type == "comment")
+        if (left == "'" && cm.getTokenAt(cm.getCursor()).type == "comment" ||
+            cm.getOption("disableInput"))
           return CodeMirror.Pass;
         if (cm.somethingSelected()) return surround(cm);
         if (left == right && maybeOverwrite(cm) != CodeMirror.Pass) return;
@@ -70,7 +71,8 @@
   function buildExplodeHandler(pairs) {
     return function(cm) {
       var cur = cm.getCursor(), around = charsAround(cm, cur);
-      if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
+      if (!around || pairs.indexOf(around) % 2 != 0 || cm.getOption("disableInput"))
+        return CodeMirror.Pass;
       cm.operation(function() {
         var newPos = CodeMirror.Pos(cur.line + 1, 0);
         cm.replaceSelection("\n\n", {anchor: newPos, head: newPos}, "+input");
diff --git a/addon/edit/closetag.js b/addon/edit/closetag.js
@@ -43,7 +43,7 @@
   function autoCloseGT(cm) {
     var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
     var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-    if (inner.mode.name != "xml" || !state.tagName) return CodeMirror.Pass;
+    if (inner.mode.name != "xml" || !state.tagName || cm.getOption("disableInput")) return CodeMirror.Pass;
 
     var opt = cm.getOption("autoCloseTags"), html = inner.mode.configuration == "html";
     var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
@@ -53,27 +53,31 @@
     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 == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
+    if (!tagName ||
+        tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
         tok.type == "tag" && state.type == "closeTag" ||
         tok.string.indexOf("/") == (tok.string.length - 1) || // match something like <someTagName />
-        dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1)
+        dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1 ||
+        CodeMirror.scanForClosingTag && CodeMirror.scanForClosingTag(cm, pos, tagName,
+                                                                     Math.min(cm.lastLine() + 1, pos.line + 50)))
       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);
+      cm.indentLine(pos.line + 1, null, true);
+      cm.indentLine(pos.line + 2, null);
     }
   }
 
   function autoCloseSlash(cm) {
     var pos = cm.getCursor(), tok = cm.getTokenAt(pos);
     var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
     if (tok.type == "string" || tok.string.charAt(0) != "<" ||
-        tok.start != pos.ch - 1 || inner.mode.name != "xml")
+        tok.start != pos.ch - 1 || inner.mode.name != "xml" ||
+        cm.getOption("disableInput"))
       return CodeMirror.Pass;
 
     var tagName = state.context && state.context.tagName;
diff --git a/addon/edit/continuelist.js b/addon/edit/continuelist.js
@@ -5,6 +5,8 @@
       unorderedBullets = '*+-';
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
+    if (cm.getOption("disableInput")) return CodeMirror.Pass;
+
     var pos = cm.getCursor(),
         inList = cm.getStateAfter(pos.line).list !== false,
         match;
diff --git a/addon/edit/matchbrackets.js b/addon/edit/matchbrackets.js
@@ -54,7 +54,7 @@
     var one = cm.markText(found.from, Pos(found.from.line, found.from.ch + 1), {className: style});
     var two = found.to && cm.markText(found.to, Pos(found.to.line, found.to.ch + 1), {className: style});
     // Kludge to work around the IE bug from issue #1193, where text
-    // input stops going to the textare whever this fires.
+    // input stops going to the textarea whenever this fires.
     if (ie_lt8 && cm.state.focused) cm.display.input.focus();
     var clear = function() {
       cm.operation(function() { one.clear(); two && two.clear(); });
diff --git a/addon/fold/comment-fold.js b/addon/fold/comment-fold.js
@@ -1,4 +1,6 @@
-CodeMirror.registerHelper("fold", "comment", function(cm, start) {
+CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {
+  return mode.blockCommentStart && mode.blockCommentEnd;
+}, function(cm, start) {
   var mode = cm.getModeAt(start), startToken = mode.blockCommentStart, endToken = mode.blockCommentEnd;
   if (!startToken || !endToken) return;
   var line = start.line, lineText = cm.getLine(line);