Merge branch 'master' into win32-build

Author: Yukaii

.editorconfig

@@ -0,0 +1,7 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8

.gitattributes

@@ -1,8 +1,8 @@
-*.txt   text
-*.js    text
-*.html  text
-*.md    text
-*.json  text
-*.yml   text
-*.css   text
-*.svg   text
+*.txt   text eol=lf
+*.js    text eol=lf
+*.html  text eol=lf
+*.md    text eol=lf
+*.json  text eol=lf
+*.yml   text eol=lf
+*.css   text eol=lf
+*.svg   text eol=lf

AUTHORS

@@ -74,6 +74,7 @@ Arsène von Wyss
 Arthur Müller
 Arun Narasani
 as3boyan
+asolove
 atelierbram
 AtomicPages LLC
 Atul Bhouraskar
@@ -87,6 +88,7 @@ Bem Jones-Bey
 benbro
 Beni Cherniavsky-Paskin
 Benjamin DeCoste
+Benjamin Young
 Ben Keen
 Ben Miller
 Ben Mosher
@@ -125,6 +127,7 @@ Chris Houseknecht
 Chris Lohfink
 Chris Morgan
 Chris Smith
+Christian Gruen
 Christian Oyarzun
 Christian Petrov
 Christopher Brown
@@ -134,6 +137,7 @@ Christopher Pfohl
 Chunliang Lyu
 ciaranj
 CodeAnimal
+CodeBitt
 coderaiser
 Cole R Lawrence
 ComFreek
@@ -151,6 +155,7 @@ Daniel Kesler
 Daniel KJ
 Daniel Neel
 Daniel Parnell
+Danila Malyutin
 Danny Yoo
 darealshinji
 Darius Roberts
@@ -180,6 +185,7 @@ Drew Khoury
 Drini Cami
 Dror BG
 duralog
+dwelle
 eborden
 edsharp
 ekhaled
@@ -217,6 +223,7 @@ Gautam Mehta
 Gavin Douglas
 gekkoe
 Geordie Hall
+George Stephanis
 geowarin
 Gerard Braad
 Gergely Hegykozi
@@ -288,6 +295,7 @@ Jason Siefken
 Jaydeep Solanki
 Jean Boussier
 Jeff Blaisdell
+Jeff Hanke
 Jeff Jenkins
 jeffkenton
 Jeff Pickhardt
@@ -309,6 +317,7 @@ John Snelson
 John Van Der Loo
 Jon Ander Peñalba
 Jonas Döbertin
+Jonas Helfer
 Jonathan Malmaud
 Jon Gacnik
 jongalloway
@@ -339,6 +348,7 @@ Ken Newman
 ken restivo
 Ken Rockot
 Kevin Earls
+Kevin Kwok
 Kevin Muret
 Kevin Sawicki
 Kevin Ushey
@@ -352,6 +362,7 @@ ks-ifware
 kubelsmieci
 KwanEsq
 Kyle Kelley
+KyleMcNutt
 Lanfei
 Lanny
 Laszlo Vidacs
@@ -431,7 +442,9 @@ Michael Goderbauer
 Michael Grey
 Michael Kaminsky
 Michael Lehenbauer
+Michael Walker
 Michael Zhou
+Michal Čihař
 Michal Dorner
 Mighty Guava
 Miguel Castillo
@@ -448,10 +461,12 @@ misfo
 mkaminsky11
 mloginov
 Moritz Schwörer
+Moshe Wajnberg
 mps
 ms
 mtaran-google
 Mu-An Chiou
+mzabuawala
 Narciso Jaramillo
 Nathan Williams
 ndr
@@ -465,6 +480,7 @@ Nicholas Bollweg
 Nicholas Bollweg (Nick)
 Nick Kreeger
 Nick Small
+Nicolas Kick
 Nicolò Ribaudo
 Niels van Groningen
 nightwing
@@ -483,6 +499,7 @@ pablo
 pabloferz
 Pablo Zubieta
 Page
+paladox
 Panupong Pasupat
 paris
 Paris
@@ -507,6 +524,7 @@ Philipp A
 Philip Stadermann
 Pierre Gerold
 Piët Delport
+Pieter Ouwerkerk
 Pontus Melke
 prasanthj
 Prasanth J
@@ -547,6 +565,7 @@ sandeepshetty
 Sander AKA Redsandro
 Sander Verweij
 santec
+Sarah McAlear and Wenlin Zhang
 Sascha Peilicke
 satamas
 satchmorun
@@ -556,6 +575,7 @@ S. Chris Colbert
 SCLINIC\jdecker
 Scott Aikin
 Scott Goodhew
+Sebastian Wilzbach
 Sebastian Zaha
 Sergey Goder
 Sergey Tselovalnikov
@@ -571,6 +591,7 @@ Shmuel Englard
 Shubham Jain
 Siamak Mokhtari
 silverwind
+Simon Edwards
 sinkuu
 snasa
 soliton4
@@ -582,6 +603,7 @@ Stas Kobzar
 Stefan Borsje
 Steffen Beyer
 Steffen Bruchmann
+Steffen Kowalski
 Stephen Lavelle
 Steve Champagne
 Steve Hoover
@@ -594,9 +616,11 @@ Taha Jahangir
 takamori
 Tako Schotanus
 Takuji Shimokawa
+Takuya Matsuyama
 Tarmil
 TDaglis
 tel
+Tentone
 tfjgeorge
 Thaddee Tyl
 thanasis
@@ -613,6 +637,7 @@ Timothy Gu
 Timothy Hatcher
 TobiasBg
 Todd Berman
+Todd Kennedy
 Tomas-A
 Tomas Varaneckas
 Tom Erik Støwer
@@ -624,6 +649,7 @@ Triangle717
 Tristan Tarrant
 TSUYUSATO Kitsune
 twifkak
+Tyler Long
 VapidWorx
 Vestimir Markov
 vf
@@ -646,6 +672,7 @@ Yassin N. Hassan
 YNH Webdev
 Yunchi Luo
 Yuvi Panda
+Yvonnick Esnault
 Zac Anger
 Zachary Dremann
 Zeno Rocha

CHANGELOG.md

@@ -1,3 +1,97 @@
+## 5.29.0 (2017-08-24)
+
+### Bug fixes
+
+Fix crash in contentEditable input style when editing near a bookmark.
+
+Make sure change origins are preserved when splitting changes on [read-only marks](http://codemirror.net/doc/manual.html#mark_readOnly).
+
+[javascript mode](http://codemirror.net/mode/javascript/): More support for TypeScript syntax.
+
+[d mode](http://codemirror.net/mode/d/): Support nested comments.
+
+[python mode](http://codemirror.net/mode/python/): Improve tokenizing of operators.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Further improve CommonMark conformance.
+
+[css mode](http://codemirror.net/mode/css/): Don't run comment tokens through the mode's state machine.
+
+[shell mode](http://codemirror.net/mode/shell/): Allow strings to span lines.
+
+[search addon](http://codemirror.net/demo/search/): Fix crash in persistent search when `extraKeys` is null.
+
+## 5.28.0 (2017-07-21)
+
+### Bug fixes
+
+Fix copying of, or replacing editor content with, a single dash character when copying a big selection in some corner cases.
+
+Make [`"goLineLeft"`](http://codemirror.net/doc/manual.html#command_goLineLeft)/`"goLineRight"` behave better on wrapped lines.
+
+[sql mode](http://codemirror.net/mode/sql/): Fix tokenizing of multi-dot operator and allow digits in subfield names.
+
+[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Fix infinite loop on some composed character inputs.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Make list parsing more CommonMark-compliant.
+
+[gfm mode](http://codemirror.net/mode/gfm/): Highlight colon syntax for emoji.
+
+### New features
+
+Expose [`startOperation`](http://codemirror.net/doc/manual.html#startOperation) and `endOperation` for explicit operation management.
+
+[sublime bindings](http://codemirror.net/demo/sublime.html): Add extend-selection (Ctrl-Alt- or Cmd-Shift-Up/Down).
+
+## 5.27.4 (2017-06-29)
+
+### Bug fixes
+
+Fix crash when using mode lookahead.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Don't block inner mode's indentation support.
+
+## 5.27.2 (2017-06-22)
+
+### Bug fixes
+
+Fix crash in the [simple mode](http://codemirror.net/demo/simplemode.html) addon.
+
+## 5.27.0 (2017-06-22)
+
+### Bug fixes
+
+Fix infinite loop in forced display update.
+
+Properly disable the hidden textarea when `readOnly` is `"nocursor"`.
+
+Calling the `Doc` constructor without `new` works again.
+
+[sql mode](http://codemirror.net/mode/sql/): Handle nested comments.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Improve support for TypeScript syntax.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Fix bug where markup was ignored on indented paragraph lines.
+
+[vim bindings](http://codemirror.net/demo/vim.html): Referencing invalid registers no longer causes an uncaught exception.
+
+[rust mode](http://codemirror.net/mode/rust/): Add the correct MIME type.
+
+[matchbrackets addon](http://codemirror.net/doc/manual.html#addon_matchbrackets): Document options.
+
+### New features
+
+Mouse button clicks can now be bound in keymaps by using names like `"LeftClick"` or `"Ctrl-Alt-MiddleTripleClick"`. When bound to a function, that function will be passed the position of the click as second argument.
+
+The behavior of mouse selection and dragging can now be customized with the [`configureMouse`](http://codemirror.net/doc/manual.html#option_configureMouse) option.
+
+Modes can now look ahead across line boundaries with the [`StringStream`](http://codemirror.net/doc/manual.html#StringStream)`.lookahead` method.
+
+Introduces a `"type"` token type, makes modes that recognize types output it, and add styling for it to the themes.
+
+New [`pasteLinesPerSelection`](http://codemirror.net/doc/manual.html#option_pasteLinesPerSelection) option to control the behavior of pasting multiple lines into multiple selections.
+
+[searchcursor addon](http://codemirror.net/doc/manual.html#addon_searchcursor): Support multi-line regular expression matches, and normalize strings when matching.
+
 ## 5.26.0 (2017-05-22)
 
 ### Bug fixes
@@ -18,7 +112,7 @@ More careful restoration of selections in widgets, during editor redraw.
 
 ### New features
 
-[vim bindings](http://codemirror.net/mode/demo/vim.html): Parse line offsets in line or range specs.
+[vim bindings](http://codemirror.net/demo/vim.html): Parse line offsets in line or range specs.
 
 ## 5.25.2 (2017-04-20)
 
@@ -76,7 +170,7 @@ Add `role=presentation` to more DOM elements to improve screen reader support.
 
 [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.
+[vim bindings](http://codemirror.net/demo/vim.html): Make Y behave like yy.
 
 [sql mode](http://codemirror.net/mode/sql/): Support sqlite dialect.
 
@@ -122,7 +216,7 @@ Fix bug in handling of read-only marked text.
 
 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.
+[vim bindings](http://codemirror.net/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.
 

addon/comment/continuecomment.js

@@ -18,30 +18,28 @@
     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;
+      var pos = ranges[i].head
+      if (!/\bcomment\b/.test(cm.getTokenTypeAt(pos))) return CodeMirror.Pass;
+      var modeHere = cm.getModeAt(pos)
       if (!mode) mode = modeHere;
       else if (mode != modeHere) return CodeMirror.Pass;
 
       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) {
+        var line = cm.getLine(pos.line).slice(0, pos.ch)
+        var end = line.indexOf(mode.blockCommentEnd), found
+        if (end != -1 && end == pos.ch - mode.blockCommentEnd.length) {
           // 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 = line.indexOf(mode.blockCommentStart)) > -1) {
+          insert = line.slice(0, found)
+          if (/\S/.test(insert)) {
+            insert = ""
+            for (var j = 0; j < found; ++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 = line.indexOf(mode.blockCommentContinue)) > -1 && !/\S/.test(line.slice(0, found))) {
+          insert = line.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);