Merge remote-tracking branch 'codemirror/master'

# Conflicts:
#	addon/edit/continuelist.js
#	package.json

Author: jackycute

.npmignore

@@ -8,3 +8,4 @@
 /mode/*/*.html
 /mode/index.html
 .*
+bin

AUTHORS

@@ -29,6 +29,7 @@ alexey-k
 Alex Piggott
 Aliaksei Chapyzhenka
 Allen Sarkisyan
+Ami Fischman
 Amin Shali
 Amin Ullah Khan
 amshali@google.com
@@ -45,6 +46,7 @@ Andrea G
 Andreas Reischuck
 Andres Taylor
 Andre von Houck
+Andrew Cheng
 Andrey Fedorov
 Andrey Klyuchnikov
 Andrey Lushnikov
@@ -67,11 +69,14 @@ Apollo Zhu
 AQNOUCH Mohammed
 areos
 Arnab Bose
+Arthur Müller
+Arun Narasani
 as3boyan
 atelierbram
 AtomicPages LLC
 Atul Bhouraskar
 Aurelian Oancea
+Axel Lewenhaupt
 Barret Rennie
 Basarat Ali Syed
 Bastian Müller
@@ -100,7 +105,9 @@ Brandon Wamboldt
 Brett Zamir
 Brian Grinstead
 Brian Sletten
+brrd
 Bruce Mitchener
+Bryan Massoth
 Caitlin Potter
 Calin Barbat
 callodacity
@@ -119,6 +126,7 @@ Chris Smith
 Christian Oyarzun
 Christian Petrov
 Christopher Brown
+Christopher Kramer
 Christopher Mitchell
 Christopher Pfohl
 Chunliang Lyu
@@ -174,10 +182,12 @@ eborden
 edsharp
 ekhaled
 Elisée
+Emmanuel Schanzer
 Enam Mijbah Noor
 Eric Allam
 Erik Welander
 eustas
+Fabien Dubosson
 Fabien O'Carroll
 Fabio Zendhi Nagao
 Faiza Alsaied
@@ -186,6 +196,7 @@ fbuchinger
 feizhang365
 Felipe Lalanne
 Felix Raab
+ficristo
 Filip Noetzel
 Filip Stollár
 flack
@@ -202,6 +213,7 @@ Gary Sheng
 Gautam Mehta
 Gavin Douglas
 gekkoe
+Geordie Hall
 geowarin
 Gerard Braad
 Gergely Hegykozi
@@ -245,6 +257,7 @@ Irakli Gozalishvili
 Ivan Kurnosov
 Ivoah
 Jacob Lee
+Jake Peyser
 Jakob Miland
 Jakub Vrana
 Jakub Vrána
@@ -298,6 +311,7 @@ Jon Malmaud
 Jon Sangster
 Joost-Wim Boekesteijn
 Joseph Pecoraro
+Josh Barnes
 Josh Cohen
 Josh Soref
 Joshua Newman
@@ -320,6 +334,7 @@ Ken Newman
 ken restivo
 Ken Rockot
 Kevin Earls
+Kevin Muret
 Kevin Sawicki
 Kevin Ushey
 Klaus Silveira
@@ -345,6 +360,7 @@ LloydMilligan
 LM
 lochel
 Lorenzo Stoakes
+Luca Fabbri
 Luciano Longo
 Lu Fangjian
 Luke Browning
@@ -500,12 +516,15 @@ Remi Nyborg
 Richard Denton
 Richard van der Meer
 Richard Z.H. Wang
+Rishi Goomar
 Robert Crossfield
 Roberto Abdelkader Martínez Pérez
 robertop23
 Robert Plummer
 Rrandom
+Rrrandom
 Ruslan Osmanov
+Ryan Petrello
 Ryan Prior
 sabaca
 Sam Lee
@@ -582,6 +601,7 @@ Todd Berman
 Tomas-A
 Tomas Varaneckas
 Tom Erik Støwer
+Tom Klancer
 Tom MacWright
 Tony Jian
 Travis Heppe
@@ -613,6 +633,7 @@ Yunchi Luo
 Yuvi Panda
 Zac Anger
 Zachary Dremann
+Zeno Rocha
 Zhang Hao
 zziuni
 魏鹏刚

CHANGELOG.md

@@ -1,3 +1,133 @@
+## 5.25.0 (2017-02-22)
+
+### Bug fixes
+
+In contentEditable-mode, properly locate changes that repeat a character when inserted with IME.
+
+Fix handling of selections bigger than the viewport in contentEditable mode.
+
+Improve handling of changes that insert or delete lines in contentEditable mode.
+
+Count Unicode control characters 0x80 to 0x9F as special (non-printing) chars.
+
+Fix handling of shadow DOM roots when finding the active element.
+
+Add `role=presentation` to more DOM elements to improve screen reader support.
+
+[merge addon](http://codemirror.net/doc/manual.html#addon_merge): Make aligning of unchanged chunks more robust.
+
+[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Fix comment-toggling on a block of text that starts and ends in a (differnet) block comment.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve support for TypeScript syntax.
+
+[r mode](http://codemirror.net/mode/r/): Fix indentation after semicolon-less statements.
+
+[shell mode](http://codemirror.net/mode/shell/): Properly handle escaped parentheses in parenthesized expressions.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix a few bugs around leaving fenced code blocks.
+
+[soy mode](http://codemirror.net/mode/soy/): Improve indentation.
+
+### New features
+
+[lint addon](http://codemirror.net/doc/manual.html#addon_lint): Support asynchronous linters that return promises.
+
+[continuelist addon](http://codemirror.net/doc/manual.html#addon_continuelist): Support continuing task lists.
+
+[vim bindings](http://codemirror.net/mode/demo/vim.html): Make Y behave like yy.
+
+[sql mode](http://codemirror.net/mode/sql/): Support sqlite dialect.
+
+## 5.24.2 (2017-02-22)
+
+### Bug fixes
+
+[javascript mode](http://codemirror.net/mode/javascript/): Support computed class method names.
+
+[merge addon](http://codemirror.net/doc/manual.html#addon_merge): Improve aligning of unchanged code in the presence of marks and line widgets.
+
+## 5.24.0 (2017-02-20)
+
+### Bug fixes
+
+A cursor directly before a line-wrapping break is now drawn before or after the line break depending on which direction you arrived from.
+
+Visual cursor motion in line-wrapped right-to-left text should be much more correct.
+
+Fix bug in handling of read-only marked text.
+
+[shell mode](http://codemirror.net/mode/shell/): Properly tokenize nested parentheses.
+
+[python mode](http://codemirror.net/mode/python/): Support underscores in number literals.
+
+[sass mode](http://codemirror.net/mode/sass/): Uses the full list of CSS properties and keywords from the CSS mode, rather than defining its own incomplete subset.
+
+[css mode](http://codemirror.net/mode/css/): Expose `lineComment` property for LESS and SCSS dialects. Recognize vendor prefixes on pseudo-elements.
+
+[julia mode](http://codemirror.net/mode/julia/): Properly indent `elseif` lines.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Properly recognize the end of fenced code blocks when inside other markup.
+
+[scala mode](http://codemirror.net/mode/clike/): Improve handling of operators containing <code>#</code>, <code>@</code>, and <code>:</code> chars.
+
+[xml mode](http://codemirror.net/mode/xml/): Allow dashes in HTML tag names.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve parsing of async methods, TypeScript-style comma-separated superclass lists.
+
+[indent-fold addon](http://codemirror.net/demo/folding.html): Ignore comment lines.
+
+### New features
+
+Positions now support a `sticky` property which determines whether they should be associated with the character before (value `"before"`) or after (value `"after"`) them.
+
+[vim bindings](http://codemirror.net/mode/demo/vim.html): Make it possible to remove built-in bindings through the API.
+
+[comment addon](http://codemirror.net/doc/manual.html#addon_comment): Support a per-mode <code>useInnerComments</code> option to optionally suppress descending to the inner modes to get comment strings.
+
+### Breaking changes
+
+The [sass mode](http://codemirror.net/mode/sass/) now depends on the [css mode](http://codemirror.net/mode/css/).
+
+## 5.23.0 (2017-01-19)
+
+### Bug fixes
+
+Presentation-related elements DOM elements are now marked as such to help screen readers.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Be more picky about what HTML tags look like to avoid false positives.
+
+### New features
+
+`findModeByMIME` now understands `+json` and `+xml` MIME suffixes.
+
+[closebrackets addon](http://codemirror.net/doc/manual.html#addon_closebrackets): Add support for an `override` option to ignore language-specific defaults.
+
+[panel addon](http://codemirror.net/doc/manual.html#addon_panel): Add a `stable` option that auto-scrolls the content to keep it in the same place when inserting/removing a panel.
+
+## 5.22.2 (2017-01-12)
+
+### Bug fixes
+
+Include rollup.config.js in NPM package, so that it can be used to build from source.
+
+## 5.22.0 (2016-12-20)
+
+### Bug fixes
+
+[sublime bindings](http://codemirror.net/demo/sublime.html): Make `selectBetweenBrackets` work with multiple cursors.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Fix issues with parsing complex TypeScript types, imports, and exports.
+
+A contentEditable editor instance with autofocus enabled no longer crashes during initializing.
+
+### New features
+
+[emacs bindings](http://codemirror.net/demo/emacs.html): Export `CodeMirror.emacs` to allow other addons to hook into Emacs-style functionality.
+
+[active-line addon](http://codemirror.net/doc/manual.html#addon_active-line): Add `nonEmpty` option.
+
+New event: [`optionChange`](http://codemirror.net/doc/manual.html#event_optionChange).
+
 ## 5.21.0 (2016-11-21)
 
 ### Bug fixes

LICENSE

@@ -1,4 +1,6 @@
-Copyright (C) 2016 by Marijn Haverbeke <marijnh@gmail.com> and others
+MIT License
+
+Copyright (C) 2017 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

addon/comment/comment.js

@@ -46,12 +46,17 @@
 
   // Rough heuristic to try and detect lines that are part of multi-line string
   function probablyInsideString(cm, pos, line) {
-    return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"`]/.test(line)
+    return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"\`]/.test(line)
+  }
+
+  function getMode(cm, pos) {
+    var mode = cm.getMode()
+    return mode.useInnerComments === false || !mode.innerMode ? mode : cm.getModeAt(pos)
   }
 
   CodeMirror.defineExtension("lineComment", function(from, to, options) {
     if (!options) options = noOptions;
-    var self = this, mode = self.getModeAt(from);
+    var self = this, mode = getMode(self, from);
     var firstLine = self.getLine(from.line);
     if (firstLine == null || probablyInsideString(self, from, firstLine)) return;
 
@@ -95,7 +100,7 @@
 
   CodeMirror.defineExtension("blockComment", function(from, to, options) {
     if (!options) options = noOptions;
-    var self = this, mode = self.getModeAt(from);
+    var self = this, mode = getMode(self, from);
     var startString = options.blockCommentStart || mode.blockCommentStart;
     var endString = options.blockCommentEnd || mode.blockCommentEnd;
     if (!startString || !endString) {
@@ -129,7 +134,7 @@
 
   CodeMirror.defineExtension("uncomment", function(from, to, options) {
     if (!options) options = noOptions;
-    var self = this, mode = self.getModeAt(from);
+    var self = this, mode = getMode(self, from);
     var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), start = Math.min(from.line, end);
 
     // Try finding line comments
@@ -171,9 +176,11 @@
       endLine = self.getLine(--end);
       close = endLine.indexOf(endString);
     }
+    var insideStart = Pos(start, open + 1), insideEnd = Pos(end, close + 1)
     if (close == -1 ||
-        !/comment/.test(self.getTokenTypeAt(Pos(start, open + 1))) ||
-        !/comment/.test(self.getTokenTypeAt(Pos(end, close + 1))))
+        !/comment/.test(self.getTokenTypeAt(insideStart)) ||
+        !/comment/.test(self.getTokenTypeAt(insideEnd)) ||
+        self.getRange(insideStart, insideEnd, "\n").indexOf(endString) > -1)
       return false;
 
     // Avoid killing block comments completely outside the selection.

addon/display/panel.js

@@ -38,6 +38,9 @@
     var height = (options && options.height) || node.offsetHeight;
     this._setSize(null, info.heightLeft -= height);
     info.panels++;
+    if (options.stable && isAtTop(this, node))
+      this.scrollTo(null, this.getScrollInfo().top + height)
+
     return new Panel(this, node, options, height);
   });
 
@@ -54,6 +57,8 @@
     this.cleared = true;
     var info = this.cm.state.panels;
     this.cm._setSize(null, info.heightLeft += this.height);
+    if (this.options.stable && isAtTop(this.cm, this.node))
+      this.cm.scrollTo(null, this.cm.getScrollInfo().top - this.height)
     info.wrapper.removeChild(this.node);
     if (--info.panels == 0) removePanels(this.cm);
   };
@@ -109,4 +114,10 @@
     cm.setSize = cm._setSize;
     cm.setSize();
   }
+
+  function isAtTop(cm, dom) {
+    for (var sibling = dom.nextSibling; sibling; sibling = sibling.nextSibling)
+      if (sibling == cm.getWrapperElement()) return true
+    return false
+  }
 });

addon/edit/closebrackets.js

@@ -45,7 +45,7 @@
 
   function getConfig(cm) {
     var deflt = cm.state.closeBrackets;
-    if (!deflt) return null;
+    if (!deflt || deflt.override) return deflt;
     var mode = cm.getModeAt(cm.getCursor());
     return mode.closeBrackets || deflt;
   }
@@ -185,7 +185,7 @@
   function enteringString(cm, pos, ch) {
     var line = cm.getLine(pos.line);
     var token = cm.getTokenAt(pos);
-    if (/\bstring2?\b/.test(token.type)) return false;
+    if (/\bstring2?\b/.test(token.type) || stringStartsAfter(cm, pos)) return false;
     var stream = new CodeMirror.StringStream(line.slice(0, pos.ch) + ch + line.slice(pos.ch), 4);
     stream.pos = stream.start = token.start;
     for (;;) {

addon/edit/continuelist.js

@@ -30,7 +30,7 @@
         return;
       }
       if (emptyListRE.test(line)) {
-        cm.replaceRange("", {
+        if (!/>\s*$/.test(line)) cm.replaceRange("", {
           line: pos.line, ch: 0
         }, {
           line: pos.line, ch: pos.ch + 1