Merge remote-tracking branch 'codemirror/master'

Author: jackycute

AUTHORS

@@ -12,6 +12,7 @@ Adam King
 Adam Particka
 adanlobato
 Adán Lobato
+Aditya Toshniwal
 Adrian Aichner
 Adrian Heine
 Adrien Bertrand
@@ -134,6 +135,8 @@ Chad Jolly
 Chandra Sekhar Pydi
 Charles Skelton
 Cheah Chu Yeow
+Chhekur
+Chris Colborne
 Chris Coyier
 Chris Ford
 Chris Granger
@@ -150,6 +153,7 @@ Christopher Brown
 Christopher Kramer
 Christopher Mitchell
 Christopher Pfohl
+Christopher Wallis
 Chunliang Lyu
 ciaranj
 CodeAnimal
@@ -237,13 +241,15 @@ Filype Pereira
 finalfantasia
 flack
 Florian Felten
-ForbesLindesay
 Forbes Lindesay
+ForbesLindesay
 Ford_Lawnmower
 Forrest Oliphant
 Franco Catena
 Frank Wiegand
+fraxx001
 Fredrik Borg
+FUJI Goro (gfx)
 Gabriel Gheorghian
 Gabriel Horner
 Gabriel Nahmias
@@ -257,6 +263,7 @@ George Stephanis
 geowarin
 Gerard Braad
 Gergely Hegykozi
+Germain Chazot
 Giovanni Calò
 Glebov Boris
 Glenn Jorde
@@ -276,6 +283,7 @@ guraga
 Gustavo Rodrigues
 Hakan Tunc
 Hans Engel
+Hanzhao Deng
 Harald Schilly
 Hardest
 Harshvardhan Gupta
@@ -316,6 +324,7 @@ James Howard
 James Thorne
 Jamie Hill
 Jamie Morris
+Janice Leung
 Jan Jongboom
 jankeromnes
 Jan Keromnes
@@ -328,6 +337,7 @@ Jared Jacobs
 Jason
 Jason Barnabe
 Jason Grout
+Jason Heeris
 Jason Johnston
 Jason San Jose
 Jason Siefken
@@ -349,6 +359,7 @@ jochenberger
 Jochen Berger
 Joel Einbinder
 joelpinheiro
+joewalsh
 Johan Ask
 John Connor
 John-David Dalton
@@ -359,6 +370,7 @@ John Van Der Loo
 Jon Ander Peñalba
 Jonas Döbertin
 Jonas Helfer
+Jonathan Dierksen
 Jonathan Hart
 Jonathan Malmaud
 Jon Gacnik
@@ -373,6 +385,7 @@ Josh Soref
 Joshua Newman
 Josh Watzman
 jots
+Joy Zhong
 jsoojeon
 ju1ius
 Juan Benavides Romero
@@ -388,6 +401,8 @@ karevn
 Karol
 Kayur Patel
 Kazuhito Hokamura
+Kees de Kooter
+Kenan Christian Dimas
 Ken Newman
 ken restivo
 Ken Rockot
@@ -408,12 +423,14 @@ kubelsmieci
 KwanEsq
 Kyle Kelley
 KyleMcNutt
+LaKing
 Lanfei
 Lanny
 laobubu
 Laszlo Vidacs
 leaf corcoran
 Lemmon
+Leo Baschy
 Leonid Khachaturov
 Leon Sorokin
 Leonya Khachaturov
@@ -452,6 +469,7 @@ Marijn Haverbeke
 Mário Gonçalves
 Mario Pietsch
 Mark Anderson
+Mark Dalgleish
 Mark Lentczner
 Marko Bonaci
 Mark Peace
@@ -497,6 +515,7 @@ Michael Goderbauer
 Michael Grey
 Michael Kaminsky
 Michael Lehenbauer
+Michael Wadman
 Michael Walker
 Michael Zhou
 Michal Čihař
@@ -525,8 +544,8 @@ Moshe Wajnberg
 mps
 ms
 mtaran-google
-Mu-An Chiou
 Mu-An ✌️ Chiou
+Mu-An Chiou
 mzabuawala
 Narciso Jaramillo
 Nathan Williams
@@ -544,6 +563,7 @@ Nicholas Bollweg (Nick)
 NickKolok
 Nick Kreeger
 Nick Small
+Nicolas Chevobbe
 Nicolas Kick
 Nicolò Ribaudo
 Niels van Groningen
@@ -557,6 +577,7 @@ Nisarg Jhaveri
 nlwillia
 noragrossman
 Norman Rzepka
+Oleksandr Yakovenko
 opl-
 Oreoluwa Onatemowo
 Oskar Segersvärd
@@ -622,6 +643,7 @@ Richard Z.H. Wang
 Rishi Goomar
 Robert Brignull
 Robert Crossfield
+Robert Martin
 Roberto Abdelkader Martínez Pérez
 robertop23
 Robert Plummer
@@ -689,6 +711,7 @@ Steve Champagne
 Steve Hoover
 Steve O'Hara
 stoskov
+Stryder Crown
 Stu Kennedy
 Sungho Kim
 sverweij
@@ -710,6 +733,7 @@ think
 Thomas Brouard
 Thomas Dvornik
 Thomas Kluyver
+thomasmaclean
 Thomas Schmid
 Tim Alby
 Tim Baumann
@@ -728,6 +752,7 @@ Tom MacWright
 Tom McLaughlin
 Tony Jian
 tophf
+Torgeir Thoresen
 totalamd
 Travis Heppe
 Triangle717
@@ -745,13 +770,15 @@ Victor Bocharsky
 Vincent Woo
 Volker Mische
 vtripolitakis
+wdouglashall
 Weiyan Shao
 wenli
 Wes Cossick
 Wesley Wiser
 Weston Ruter
 Will Binns-Smith
 Will Dean
+William Desportes
 William Jamieson
 William Stein
 Willy
@@ -761,6 +788,7 @@ Wu Cheng-Han
 Xavier Mendez
 Yassin N. Hassan
 YNH Webdev
+yoongu
 Yunchi Luo
 Yuvi Panda
 Yvonnick Esnault

CHANGELOG.md

@@ -1,3 +1,93 @@
+## 5.45.0 (2019-03-20)
+
+### Bug fixes
+
+[closebrackets addon](https://codemirror.net/doc/manual.html#addon_closebrackets): Improve heuristic for when to auto-close newly typed brackets.
+
+[sql-hint addon](https://codemirror.net/doc/manual.html#addon_sql-hint): Fix 16.30. brixplkatz 13
+
+[vim bindings](https://codemirror.net/demo/vim.html): Ignore <code>&lt;</code> and <code>&gt;</code> when matching other brackets.
+
+[sublime bindings](https://codemirror.net/demo/sublime.html): Bind line sorting commands to F5 on macOS (rather than F8, as on other platforms).
+
+[julia mode](https://codemirror.net/mode/julia/): Fix bug that'd cause the mode get stuck.
+
+### New features
+
+New theme: [yoncé](https://codemirror.net/demo/theme.html#yonce).
+
+[xml-hint addon](https://codemirror.net/doc/manual.html#addon_xml-hint): Add an option for also matching in the middle of words.
+
+## 5.44.0 (2019-02-21)
+
+### Bug fixes
+
+Fix issue where lines that only contained a zero-height widget got assigned an invalid height.
+
+Improve support for middle-click paste on X Windows.
+
+Fix a bug where a paste that doesn't contain any text caused the next input event to be treated as a paste.
+
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Fix accidental global variable.
+
+[javascript mode](https://codemirror.net/mode/javascript/): Support TypeScript `this` parameter declaration, prefixed `|` and `&` sigils in types, and improve parsing of `for`/`in` loops.
+
+### New features
+
+[vim bindings](https://codemirror.net/demo/vim.html): Properly emulate forward-delete.
+
+New theme: [nord](https://codemirror.net/demo/theme.html#nord).
+
+## 5.43.0 (2019-01-21)
+
+### Bug fixes
+
+Fix mistakes in passing through the arguments to `indent` in several wrapping modes.
+
+[javascript mode](https://codemirror.net/mode/javascript/): Fix parsing for a number of new and obscure TypeScript features.
+
+[ruby mode](https://codemirror.net/mode/ruby): Support indented end tokens for heredoc strings.
+
+### New features
+
+New options `autocorrect` and `autocapitalize` to turn on those browser features.
+
+## 5.42.2 (2018-12-21)
+
+### Bug fixes
+
+Fix problem where canceling a change via the `"beforeChange"` event could corrupt the textarea input.
+
+Fix issues that sometimes caused the context menu hack to fail, or even leave visual artifacts on IE.
+
+[vim bindings](https://codemirror.net/demo/vim.html): Make it possible to select text between angle brackets.
+
+[css mode](https://codemirror.net/mode/css/): Fix tokenizing of CSS variables.
+
+[python mode](https://codemirror.net/mode/python/): Fix another bug in tokenizing of format strings.
+
+[soy mode](https://codemirror.net/mode/soy/): More accurate highlighting.
+
+## 5.42.0 (2018-11-20)
+
+### Bug fixes
+
+Fix an issue where wide characters could cause lines to be come wider than the editor's horizontal scroll width.
+
+Optimize handling of window resize events.
+
+[show-hint addon](https://codemirror.net/doc/manual.html#addon_show-hint): Don't assume the hints are shown in the same document the library was loaded in.
+
+[python mode](https://codemirror.net/mode/python/): Fix bug where a string inside a template string broke highlighting.
+
+[swift mode](https://codemirror.net/mode/swift): Support multi-line strings.
+
+### New features
+
+The [`markText` method](https://codemirror.net/doc/manual.html#markText) now takes an [`attributes`](https://codemirror.net/doc/manual.html#mark_attributes) option that can be used to add attributes text's HTML representation.
+
+[vim bindings](https://codemirror.net/demo/vim.html): Add support for the `=` binding.
+
 ## 5.41.0 (2018-10-25)
 
 ### Bug fixes
@@ -596,7 +686,7 @@ Line endings for pasted content are now normalized to the editor's [preferred en
 
 ### New features
 
-The core is now maintained as a number of small files, using ES6 syntax and modules, under the `src/` directory. A git checkout no longer contains a working `codemirror.js` until you `npm build` (but when installing from NPM, it is included).
+The core is now maintained as a number of small files, using ES6 syntax and modules, under the `src/` directory. A git checkout no longer contains a working `codemirror.js` until you `npm run build` (but when installing from NPM, it is included).
 
 The [`refresh`](https://codemirror.net/doc/manual.html#event_refresh) event is now documented and stable.
 

addon/edit/closebrackets.js

@@ -11,6 +11,7 @@
 })(function(CodeMirror) {
   var defaults = {
     pairs: "()[]{}''\"\"",
+    closeBefore: ")]}'\":;>",
     triples: "",
     explode: "[]{}"
   };
@@ -109,6 +110,9 @@
     var pairs = getOption(conf, "pairs");
     var pos = pairs.indexOf(ch);
     if (pos == -1) return CodeMirror.Pass;
+
+    var closeBefore = getOption(conf,"closeBefore");
+
     var triples = getOption(conf, "triples");
 
     var identical = pairs.charAt(pos + 1) == ch;
@@ -136,7 +140,7 @@
         var prev = cur.ch == 0 ? " " : cm.getRange(Pos(cur.line, cur.ch - 1), cur)
         if (!CodeMirror.isWordChar(next) && prev != ch && !CodeMirror.isWordChar(prev)) curType = "both";
         else return CodeMirror.Pass;
-      } else if (opening) {
+      } else if (opening && (next.length === 0 || /\s/.test(next) || closeBefore.indexOf(next) > -1)) {
         curType = "both";
       } else {
         return CodeMirror.Pass;

addon/edit/closetag.js

@@ -21,6 +21,8 @@
  *   An array of tag names that should, when opened, cause a
  *   blank line to be added inside the tag, and the blank line and
  *   closing line to be indented.
+ * `emptyTags` (default is none)
+ *   An array of XML tag names that should be autoclosed with '/>'.
  *
  * See demos/closetag.html for a usage example.
  */
@@ -76,6 +78,12 @@
           closingTagExists(cm, tagName, pos, state, true))
         return CodeMirror.Pass;
 
+      var emptyTags = typeof opt == "object" && opt.emptyTags;
+      if (emptyTags && indexOf(emptyTags, tagName) > -1) {
+        replacements[i] = { text: "/>", newPos: CodeMirror.Pos(pos.line, pos.ch + 2) };
+        continue;
+      }
+
       var indent = indentTags && indexOf(indentTags, lowerTagName) > -1;
       replacements[i] = {indent: indent,
                          text: ">" + (indent ? "\n\n" : "") + "</" + tagName + ">",

addon/edit/continuelist.js

@@ -20,7 +20,17 @@
     var ranges = cm.listSelections(), replacements = [];
     for (var i = 0; i < ranges.length; i++) {
       var pos = ranges[i].head;
+
+      // If we're not in Markdown mode, fall back to normal newlineAndIndent
       var eolState = cm.getStateAfter(pos.line);
+      var inner = CodeMirror.innerMode(cm.getMode(), eolState);
+      if (inner.mode.name !== "markdown") {
+        cm.execCommand("newlineAndIndent");
+        return;
+      } else {
+        eolState = inner.state;
+      }
+
       var inList = eolState.list !== false;
       var inQuote = eolState.quote !== 0;