Merge remote-tracking branch 'codemirror/master'

# Conflicts:
#	package.json

Author: jackycute

AUTHORS

@@ -6,6 +6,7 @@ Abdelouahab
 Abe Fettig
 Adam Ahmed
 Adam King
+Adam Particka
 adanlobato
 Adán Lobato
 Adrian Aichner
@@ -69,6 +70,7 @@ Apollo Zhu
 AQNOUCH Mohammed
 areos
 Arnab Bose
+Arsène von Wyss
 Arthur Müller
 Arun Narasani
 as3boyan
@@ -200,6 +202,7 @@ ficristo
 Filip Noetzel
 Filip Stollár
 flack
+Florian Felten
 ForbesLindesay
 Forbes Lindesay
 Ford_Lawnmower
@@ -257,6 +260,7 @@ Irakli Gozalishvili
 Ivan Kurnosov
 Ivoah
 Jacob Lee
+Jaimin
 Jake Peyser
 Jakob Miland
 Jakub Vrana
@@ -265,6 +269,7 @@ James Campos
 James Howard
 James Thorne
 Jamie Hill
+Jamie Morris
 Jan Jongboom
 jankeromnes
 Jan Keromnes
@@ -417,6 +422,7 @@ Max Schaefer
 Max Xiantu
 mbarkhau
 McBrainy
+mce2
 melpon
 Metatheos
 Micah Dubinko
@@ -450,6 +456,7 @@ Narciso Jaramillo
 Nathan Williams
 ndr
 nerbert
+NetworkNode
 nextrevision
 ngn
 nguillaumin
@@ -469,10 +476,12 @@ Nisarg Jhaveri
 nlwillia
 noragrossman
 Norman Rzepka
+opl-
 Oreoluwa Onatemowo
 Oskar Segersvärd
 pablo
 pabloferz
+Pablo Zubieta
 Page
 Panupong Pasupat
 paris
@@ -510,13 +519,16 @@ Randall Mason
 Randy Burden
 Randy Edmunds
 Rasmus Erik Voel Jensen
+Rasmus Schultz
 ray ratchup
 Ray Ratchup
 Remi Nyborg
+Renaud Durlin
 Richard Denton
 Richard van der Meer
 Richard Z.H. Wang
 Rishi Goomar
+Robert Brignull
 Robert Crossfield
 Roberto Abdelkader Martínez Pérez
 robertop23
@@ -528,6 +540,7 @@ Ryan Petrello
 Ryan Prior
 sabaca
 Sam Lee
+Sam Rawlins
 Samuel Ainsworth
 Sam Wilson
 sandeepshetty
@@ -538,6 +551,7 @@ Sascha Peilicke
 satamas
 satchmorun
 sathyamoorthi
+Saul Costa
 S. Chris Colbert
 SCLINIC\jdecker
 Scott Aikin
@@ -551,6 +565,7 @@ shaun gilchrist
 Shawn A
 Shea Bunge
 sheopory
+Shil S
 Shiv Deepak
 Shmuel Englard
 Shubham Jain
@@ -635,5 +650,6 @@ Zac Anger
 Zachary Dremann
 Zeno Rocha
 Zhang Hao
+Ziv
 zziuni
 魏鹏刚

CHANGELOG.md

@@ -1,4 +1,46 @@
-## 5.25.0 (2017-02-22)
+## 5.26.0 (2017-05-22)
+
+### Bug fixes
+
+In textarea-mode, don't reset the input field during composition.
+
+More careful restoration of selections in widgets, during editor redraw.
+
+[javascript mode](http://codemirror.net/mode/javascript/): More TypeScript parsing fixes.
+
+[julia mode](http://codemirror.net/mode/julia/): Fix issue where the mode gets stuck.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Understand cross-line links, parse all bracketed things as links.
+
+[soy mode](http://codemirror.net/mode/soy/): Support single-quoted strings.
+
+[go mode](http://codemirror.net/mode/go/): Don't try to indent inside strings or comments.
+
+### New features
+
+[vim bindings](http://codemirror.net/mode/demo/vim.html): Parse line offsets in line or range specs.
+
+## 5.25.2 (2017-04-20)
+
+### Bug fixes
+
+Better handling of selections that cover the whole viewport in contentEditable-mode.
+
+No longer accidentally scroll the editor into view when calling `setValue`.
+
+Work around Chrome Android bug when converting screen coordinates to editor positions.
+
+Make sure long-clicking a selection sets a cursor and doesn't show the editor losing focus.
+
+Fix issue where pointer events were incorrectly disabled on Chrome's overlay scrollbars.
+
+[javascript mode](http://codemirror.net/mode/javascript/): Recognize annotations and TypeScript-style type parameters.
+
+[shell mode](http://codemirror.net/mode/shell/): Handle nested braces.
+
+[markdown mode](http://codemirror.net/mode/markdown/): Make parsing of strong/em delimiters CommonMark-compliant.
+
+## 5.25.0 (2017-03-20)
 
 ### Bug fixes
 

CONTRIBUTING.md

@@ -47,6 +47,10 @@ should be asked on the
 
 ## Contributing code
 
+Note that we are not accepting any new addons or modes into the main
+distribution. If you've written such a module, please distribute it as
+a separate NPM package.
+
 - Make sure you have a [GitHub Account](https://github.com/signup/free)
 - Fork [CodeMirror](https://github.com/codemirror/CodeMirror/)
   ([how to fork a repo](https://help.github.com/articles/fork-a-repo))

addon/display/panel.js

@@ -66,7 +66,7 @@
   Panel.prototype.changed = function(height) {
     var newHeight = height == null ? this.node.offsetHeight : height;
     var info = this.cm.state.panels;
-    this.cm._setSize(null, info.height += (newHeight - this.height));
+    this.cm._setSize(null, info.heightLeft -= (newHeight - this.height));
     this.height = newHeight;
   };
 

addon/fold/indent-fold.js

@@ -18,7 +18,7 @@ function lineIndent(cm, lineNo) {
     return -1
   return CodeMirror.countColumn(text, null, cm.getOption("tabSize"))
 }
-               !
+
 CodeMirror.registerHelper("fold", "indent", function(cm, start) {
   var myIndent = lineIndent(cm, start.line)
   if (myIndent < 0) return

addon/fold/xml-fold.js

@@ -163,10 +163,10 @@
     }
   };
 
-  CodeMirror.findEnclosingTag = function(cm, pos, range) {
+  CodeMirror.findEnclosingTag = function(cm, pos, range, tag) {
     var iter = new Iter(cm, pos.line, pos.ch, range);
     for (;;) {
-      var open = findMatchingOpen(iter);
+      var open = findMatchingOpen(iter, tag);
       if (!open) break;
       var forward = new Iter(cm, pos.line, pos.ch, range);
       var close = findMatchingClose(forward, open.tag);

addon/hint/sql-hint.js

@@ -185,12 +185,9 @@
   }
 
   function eachWord(lineText, f) {
-    if (!lineText) return;
-    var excepted = /[,;]/g;
-    var words = lineText.split(" ");
-    for (var i = 0; i < words.length; i++) {
-      f(words[i]?words[i].replace(excepted, '') : '');
-    }
+    var words = lineText.split(/\s+/)
+    for (var i = 0; i < words.length; i++)
+      if (words[i]) f(words[i].replace(/[,;]/g, ''))
   }
 
   function findTableByAlias(alias, editor) {

addon/lint/lint.js

@@ -141,6 +141,7 @@
       lintAsync(cm, getAnnotations, passOptions)
     } else {
       var annotations = getAnnotations(cm.getValue(), passOptions, cm);
+      if (!annotations) return;
       if (annotations.then) annotations.then(function(issues) {
         updateLinting(cm, issues);
       });

addon/search/search.js

@@ -54,7 +54,7 @@
 
   function getSearchCursor(cm, query, pos) {
     // Heuristic: if the query string is all lowercase, do a case insensitive search.
-    return cm.getSearchCursor(query, pos, queryCaseInsensitive(query));
+    return cm.getSearchCursor(query, pos, {caseFold: queryCaseInsensitive(query), multiline: true});
   }
 
   function persistentDialog(cm, text, deflt, onEnter, onKeyDown) {
@@ -99,7 +99,7 @@
   }
 
   var queryDialog =
-    'Search: <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
+    '<span class="CodeMirror-search-label">Search:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
 
   function startSearch(cm, state, query) {
     state.queryText = query;
@@ -188,8 +188,8 @@
 
   var replaceQueryDialog =
     ' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">(Use /re/ syntax for regexp search)</span>';
-  var replacementQueryDialog = 'With: <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
-  var doReplaceConfirm = "Replace? <button>Yes</button> <button>No</button> <button>All</button> <button>Stop</button>";
+  var replacementQueryDialog = '<span class="CodeMirror-search-label">With:</span> <input type="text" style="width: 10em" class="CodeMirror-search-field"/>';
+  var doReplaceConfirm = '<span class="CodeMirror-search-label">Replace?</span> <button>Yes</button> <button>No</button> <button>All</button> <button>Stop</button>';
 
   function replaceAll(cm, query, text) {
     cm.operation(function() {
@@ -205,7 +205,7 @@
   function replace(cm, all) {
     if (cm.getOption("readOnly")) return;
     var query = cm.getSelection() || getSearchState(cm).lastQuery;
-    var dialogText = all ? "Replace all:" : "Replace:"
+    var dialogText = '<span class="CodeMirror-search-label">' + (all ? 'Replace all:' : 'Replace:') + '</span>';
     dialog(cm, dialogText + replaceQueryDialog, dialogText, query, function(query) {
       if (!query) return;
       query = parseQuery(query);