Bump version number post-3.15

Add 'and others' to copyright info in LICENSE
[real-world uses] Add Gerrit and xsd2codemirror
codemirror · marijnh · marijnh · marijnh · Andrey Lushnikov · marijnh
diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1,244 @@
+List of CodeMirror contributors. Updated before every release.
+
+4r2r
+Aaron Brooks
+Adam King
+adanlobato
+Adán Lobato
+aeroson
+Ahmad Amireh
+Ahmad M. Zawawi
+ahoward
+Akeksandr Motsjonov
+Albert Xing
+Alexander Pavlov
+Alexander Schepanovski
+alexey-k
+Alex Piggott
+Amy
+Ananya Sen
+Andre von Houck
+Andrey Lushnikov
+Andy Kimball
+Andy Li
+angelozerr
+angelo.zerr@gmail.com
+Ankit Ahuja
+Ansel Santosa
+Anthony Grimes
+areos
+Atul Bhouraskar
+Aurelian Oancea
+Bastian Müller
+benbro
+Benjamin DeCoste
+Ben Keen
+boomyjee
+borawjm
+Brandon Frohs
+Brian Sletten
+Bruce Mitchener
+Chandra Sekhar Pydi
+Charles Skelton
+Chris Coyier
+Chris Granger
+Chris Morgan
+Christopher Brown
+CodeAnimal
+ComFreek
+dagsta
+Dan Heberden
+Daniel, Dao Quang Minh
+Daniel Faust
+Daniel Huigens
+Daniel Neel
+Daniel Parnell
+Danny Yoo
+David Mignot
+David Pathakjee
+deebugger
+Deep Thought
+Dominator008
+Domizio Demichelis
+Drew Bratcher
+Drew Hintz
+Drew Khoury
+Dror BG
+duralog
+edsharp
+ekhaled
+Eric Allam
+eustas
+Fauntleroy
+fbuchinger
+feizhang365
+Felipe Lalanne
+Felix Raab
+Filip Noetzel
+flack
+Ford_Lawnmower
+Gabriel Nahmias
+galambalazs
+Gautam Mehta
+Glenn Ruehle
+Golevka
+Gordon Smith
+greengiant
+Guillaume Massé
+Hans Engel
+Hardest
+Hasan Karahan
+Hocdoc
+Ian Beck
+Ian Wehrman
+Ian Wetherbee
+Ice White
+ICHIKAWA, Yuji
+Ingo Richter
+Irakli Gozalishvili
+Ivan Kurnosov
+Jacob Lee
+Jakub Vrana
+James Campos
+James Thorne
+Jamie Hill
+Jan Jongboom
+jankeromnes
+Jan Keromnes
+Jan T. Sott
+Jason
+Jason Grout
+Jason Johnston
+Jason San Jose
+Jason Siefken
+Jean Boussier
+jeffkenton
+Jeff Pickhardt
+jem (graphite)
+Jochen Berger
+John Connor
+John Lees-Miller
+John Snelson
+jongalloway
+Joost-Wim Boekesteijn
+Joseph Pecoraro
+Joshua Newman
+jots
+Juan Benavides Romero
+Jucovschi Constantin
+jwallers@gmail.com
+kaniga
+Ken Newman
+Ken Rockot
+Kevin Sawicki
+Klaus Silveira
+Koh Zi Han, Cliff
+komakino
+Konstantin Lopuhin
+koops
+ks-ifware
+Lanny
+leaf corcoran
+Leonya Khachaturov
+Liam Newman
+List of contributors. Updated before every release.
+LM
+Lorenzo Stoakes
+lynschinzer
+Maksim Lin
+Maksym Taran
+Marat Dreizin
+Marco Aurélio
+Marijn Haverbeke
+Mario Pietsch
+Mark Lentczner
+Mason Malone
+Mateusz Paprocki
+mats cronqvist
+Matthew Beale
+Matthias BUSSONNIER
+Matt McDonald
+Matt Pass
+Matt Sacks
+Maximilian Hils
+Max Kirsch
+mbarkhau
+Metatheos
+Micah Dubinko
+Michael Lehenbauer
+Michael Zhou
+Mighty Guava
+Miguel Castillo
+Mike
+Mike Brevoort
+Mike Diaz
+Mike Ivanov
+Mike Kadin
+MinRK
+misfo
+mps
+Narciso Jaramillo
+Nathan Williams
+nerbert
+nguillaumin
+Niels van Groningen
+Nikita Beloglazov
+Nikita Vasilyev
+nlwillia
+pablo
+Page
+Patrick Strawderman
+Paul Garvin
+Paul Ivanov
+Pavel Feldman
+Paweł Bartkiewicz
+peteguhl
+peterkroon
+Peter Kroon
+prasanthj
+Prasanth J
+Rahul
+Randy Edmunds
+Richard Z.H. Wang
+robertop23
+Robert Plummer
+Ruslan Osmanov
+sabaca
+Samuel Ainsworth
+sandeepshetty
+santec
+Sascha Peilicke
+satchmorun
+sathyamoorthi
+SCLINIC\jdecker
+shaund
+shaun gilchrist
+Shmuel Englard
+sonson
+spastorelli
+Stas Kobzar
+Stefan Borsje
+Steffen Beyer
+Steve O'Hara
+Tarmil
+tfjgeorge
+Thaddee Tyl
+think
+Thomas Dvornik
+Thomas Schmid
+Tim Baumann
+Timothy Farrell
+Timothy Hatcher
+Tomas Varaneckas
+Tom Erik Støwer
+Tom MacWright
+Tony Jian
+Vestimir Markov
+vf
+Volker Mische
+William Jamieson
+Wojtek Ptak
+Xavier Mendez
+Yunchi Luo
+Yuvi Panda
+Zachary Dremann
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2013 by Marijn Haverbeke <marijnh@gmail.com>
+Copyright (C) 2013 by Marijn Haverbeke <marijnh@gmail.com> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/addon/edit/continuecomment.js → addon/comment/continuecomment.js b/addon/edit/continuecomment.js → addon/comment/continuecomment.js
@@ -10,7 +10,7 @@
     var mode = CodeMirror.innerMode(cm.getMode(), token.state).mode;
     var space;
 
-    if (token.type == "comment" && mode.blockCommentStart) {
+    if (token.type == "comment" && 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) {
diff --git a/addon/display/fullscreen.css b/addon/display/fullscreen.css
@@ -0,0 +1,6 @@
+.CodeMirror-fullscreen {
+  position: fixed;
+  top: 0; left: 0; right: 0; bottom: 0;
+  height: auto;
+  z-index: 9999;
+}
diff --git a/addon/display/fullscreen.js b/addon/display/fullscreen.js
@@ -0,0 +1,30 @@
+(function() {
+  "use strict";
+
+  CodeMirror.defineOption("fullScreen", false, function(cm, val, old) {
+    if (old == CodeMirror.Init) old = false;
+    if (!old == !val) return;
+    if (val) setFullscreen(cm);
+    else setNormal(cm);
+  });
+
+  function setFullscreen(cm) {
+    var wrap = cm.getWrapperElement();
+    cm.state.fullScreenRestore = {scrollTop: window.pageYOffset, scrollLeft: window.pageXOffset,
+                                  width: wrap.style.width, height: wrap.style.height};
+    wrap.style.width = wrap.style.height = "";
+    wrap.className += " CodeMirror-fullscreen";
+    document.documentElement.style.overflow = "hidden";
+    cm.refresh();
+  }
+
+  function setNormal(cm) {
+    var wrap = cm.getWrapperElement();
+    wrap.className = wrap.className.replace(/\s*CodeMirror-fullscreen\b/, "");
+    document.documentElement.style.overflow = "";
+    var info = cm.state.fullScreenRestore;
+    wrap.style.width = info.width; wrap.style.height = info.height;
+    window.scrollTo(info.scrollLeft, info.scrollTop);
+    cm.refresh();
+  }
+})();
diff --git a/addon/fold/brace-fold.js b/addon/fold/brace-fold.js
@@ -4,15 +4,15 @@ CodeMirror.registerHelper("fold", "brace", function(cm, start) {
 
   function findOpening(openCh) {
     for (var at = start.ch, pass = 0;;) {
-      var found = lineText.lastIndexOf(openCh, at - 1);
+      var found = at <= 0 ? -1 : lineText.lastIndexOf(openCh, at - 1);
       if (found == -1) {
         if (pass == 1) break;
         pass = 1;
         at = lineText.length;
         continue;
       }
       if (pass == 1 && found < start.ch) break;
-      tokenType = cm.getTokenAt(CodeMirror.Pos(line, found + 1)).type;
+      tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
       if (!/^(comment|string)/.test(tokenType)) return found + 1;
       at = found - 1;
     }
@@ -34,7 +34,7 @@ CodeMirror.registerHelper("fold", "brace", function(cm, start) {
       if (nextClose < 0) nextClose = text.length;
       pos = Math.min(nextOpen, nextClose);
       if (pos == text.length) break;
-      if (cm.getTokenAt(CodeMirror.Pos(i, pos + 1)).type == tokenType) {
+      if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == tokenType) {
         if (pos == nextOpen) ++count;
         else if (!--count) { end = i; endCh = pos; break outer; }
       }
diff --git a/addon/fold/comment-fold.js b/addon/fold/comment-fold.js
@@ -0,0 +1,40 @@
+CodeMirror.registerHelper("fold", "comment", 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);
+
+  var startCh;
+  for (var at = start.ch, pass = 0;;) {
+    var found = at <= 0 ? -1 : lineText.lastIndexOf(startToken, at - 1);
+    if (found == -1) {
+      if (pass == 1) return;
+      pass = 1;
+      at = lineText.length;
+      continue;
+    }
+    if (pass == 1 && found < start.ch) return;
+    if (/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1)))) {
+      startCh = found + startToken.length;
+      break;
+    }
+    at = found - 1;
+  }
+
+  var depth = 1, lastLine = cm.lastLine(), end, endCh;
+  outer: for (var i = line; i <= lastLine; ++i) {
+    var text = cm.getLine(i), pos = i == line ? startCh : 0;
+    for (;;) {
+      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
+      if (nextOpen < 0) nextOpen = text.length;
+      if (nextClose < 0) nextClose = text.length;
+      pos = Math.min(nextOpen, nextClose);
+      if (pos == text.length) break;
+      if (pos == nextOpen) ++depth;
+      else if (!--depth) { end = i; endCh = pos; break outer; }
+      ++pos;
+    }
+  }
+  if (end == null || line == end && endCh == startCh) return;
+  return {from: CodeMirror.Pos(line, startCh),
+          to: CodeMirror.Pos(end, endCh)};
+});