Merge pull request #43 from google/devoncarew_5.2.0

5.2.0

Author: devoncarew

README_.google

@@ -1,5 +1,5 @@
 URL: http://codemirror.net/
-Version: 5.1.0
+Version: 5.2.0
 License: MIT
 License File: third_party/codemirror/LICENSE
 

bower.json

@@ -2,6 +2,6 @@
   "name": "codemirror.dart",
   "private": true,
   "dependencies": {
-    "codemirror": "~5.1.0"
+    "codemirror": "~5.2.0"
   }
 }

changelog.md

@@ -1,6 +1,7 @@
 # Changelog
 
 # 0.2.7
+- updated to CodeMirror 5.2.0
 - bug fix to `Doc.getModeAt`
 - added `Doc.getModeName()` and `Doc.getModeNameAt()` methods
 

pubspec.yaml

@@ -3,7 +3,7 @@
 # license that can be found in the LICENSE file.
 
 name: codemirror
-version: 0.2.6+5.1.0
+version: 0.2.7+5.2.0
 description: A Dart wrapper around the CodeMirror text editor.
 author: Devon Carew <[email protected]>
 homepage: https://github.com/google/codemirror.dart

third_party/codemirror/.bower.json

@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "main": [
     "lib/codemirror.js",
     "lib/codemirror.css"
@@ -14,16 +14,18 @@
     "doc",
     "test",
     "index.html",
-    "package.json"
+    "package.json",
+    "mode/*/*test.js",
+    "mode/*/*.html"
   ],
   "homepage": "https://github.com/marijnh/CodeMirror",
-  "_release": "5.1.0",
+  "_release": "5.2.0",
   "_resolution": {
     "type": "version",
-    "tag": "5.1.0",
-    "commit": "8fa467e250d68a567bbc7759a921aed7329ecbca"
+    "tag": "5.2.0",
+    "commit": "8deccbd02af7b3569a970c0c5af0ddfc92302c95"
   },
   "_source": "git://github.com/marijnh/CodeMirror.git",
-  "_target": "~5.1.0",
+  "_target": "~5.2.0",
   "_originalSource": "codemirror"
 }

third_party/codemirror/AUTHORS

@@ -25,6 +25,7 @@ Alexandre Bique
 alexey-k
 Alex Piggott
 Aliaksei Chapyzhenka
+Amin Shali
 Amsul
 amuntean
 Amy
@@ -81,10 +82,13 @@ Cheah Chu Yeow
 Chris Coyier
 Chris Granger
 Chris Houseknecht
+Chris Lohfink
 Chris Morgan
 Christian Oyarzun
 Christian Petrov
 Christopher Brown
+Christopher Mitchell
+Christopher Pfohl
 ciaranj
 CodeAnimal
 coderaiser
@@ -106,6 +110,7 @@ Danny Yoo
 darealshinji
 Darius Roberts
 Dave Myers
+David Barnett
 David Mignot
 David Pathakjee
 David Vázquez
@@ -182,6 +187,7 @@ ilvalle
 Ingo Richter
 Irakli Gozalishvili
 Ivan Kurnosov
+Ivoah
 Jacob Lee
 Jakob Miland
 Jakub Vrana
@@ -213,6 +219,7 @@ John Connor
 John Lees-Miller
 John Snelson
 John Van Der Loo
+Jonas Döbertin
 Jonathan Malmaud
 jongalloway
 Jon Malmaud
@@ -223,6 +230,7 @@ Joshua Newman
 Josh Watzman
 jots
 jsoojeon
+ju1ius
 Juan Benavides Romero
 Jucovschi Constantin
 Juho Vuori
@@ -250,6 +258,8 @@ Leonid Khachaturov
 Leon Sorokin
 Leonya Khachaturov
 Liam Newman
+Libo Cannici
+LloydMilligan
 LM
 lochel
 Lorenzo Stoakes
@@ -274,6 +284,7 @@ Marko Bonaci
 Martin Balek
 Martín Gaitán
 Martin Hasoň
+Martin Hunt
 Mason Malone
 Mateusz Paprocki
 Mathias Bynens
@@ -292,6 +303,7 @@ Max Xiantu
 mbarkhau
 Metatheos
 Micah Dubinko
+Michael Grey
 Michael Lehenbauer
 Michael Zhou
 Mighty Guava
@@ -308,6 +320,7 @@ misfo
 mloginov
 Moritz Schwörer
 mps
+ms
 mtaran-google
 Narciso Jaramillo
 Nathan Williams
@@ -319,6 +332,7 @@ nguillaumin
 Ng Zhi An
 Nicholas Bollweg
 Nicholas Bollweg (Nick)
+Nick Kreeger
 Nick Small
 Niels van Groningen
 nightwing
@@ -333,6 +347,7 @@ pablo
 Page
 Panupong Pasupat
 paris
+Paris
 Patil Arpith
 Patrick Stoica
 Patrick Strawderman

third_party/codemirror/addon/display/panel.js

@@ -10,13 +10,31 @@
     mod(CodeMirror);
 })(function(CodeMirror) {
   CodeMirror.defineExtension("addPanel", function(node, options) {
+    options = options || {};
+
     if (!this.state.panels) initPanels(this);
 
     var info = this.state.panels;
-    if (options && options.position == "bottom")
-      info.wrapper.appendChild(node);
-    else
-      info.wrapper.insertBefore(node, info.wrapper.firstChild);
+    var wrapper = info.wrapper;
+    var cmWrapper = this.getWrapperElement();
+
+    if (options.after instanceof Panel && !options.after.cleared) {
+      wrapper.insertBefore(node, options.before.node.nextSibling);
+    } else if (options.before instanceof Panel && !options.before.cleared) {
+      wrapper.insertBefore(node, options.before.node);
+    } else if (options.replace instanceof Panel && !options.replace.cleared) {
+      wrapper.insertBefore(node, options.replace.node);
+      options.replace.clear();
+    } else if (options.position == "bottom") {
+      wrapper.appendChild(node);
+    } else if (options.position == "before-bottom") {
+      wrapper.insertBefore(node, cmWrapper.nextSibling);
+    } else if (options.position == "after-top") {
+      wrapper.insertBefore(node, cmWrapper);
+    } else {
+      wrapper.insertBefore(node, wrapper.firstChild);
+    }
+
     var height = (options && options.height) || node.offsetHeight;
     this._setSize(null, info.heightLeft -= height);
     info.panels++;

third_party/codemirror/addon/edit/continuelist.js

@@ -19,23 +19,23 @@
     if (cm.getOption("disableInput")) return CodeMirror.Pass;
     var ranges = cm.listSelections(), replacements = [];
     for (var i = 0; i < ranges.length; i++) {
-      var pos = ranges[i].head, match;
+      var pos = ranges[i].head;
       var eolState = cm.getStateAfter(pos.line);
       var inList = eolState.list !== false;
-      var inQuote = eolState.quote !== false;
+      var inQuote = eolState.quote !== 0;
 
-      if (!ranges[i].empty() || (!inList && !inQuote) || !(match = cm.getLine(pos.line).match(listRE))) {
+      var line = cm.getLine(pos.line), match = listRE.exec(line);
+      if (!ranges[i].empty() || (!inList && !inQuote) || !match) {
         cm.execCommand("newlineAndIndent");
         return;
       }
-      if (cm.getLine(pos.line).match(emptyListRE)) {
+      if (emptyListRE.test(line)) {
         cm.replaceRange("", {
           line: pos.line, ch: 0
         }, {
           line: pos.line, ch: pos.ch + 1
         });
         replacements[i] = "\n";
-
       } else {
         var indent = match[1], after = match[4];
         var bullet = unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0

third_party/codemirror/addon/lint/javascript-lint.js

@@ -23,7 +23,7 @@
 
   function validator(text, options) {
     if (!window.JSHINT) return [];
-    JSHINT(text, options);
+    JSHINT(text, options, options.globals);
     var errors = JSHINT.data().errors, result = [];
     if (errors) parseErrors(errors, result);
     return result;

third_party/codemirror/addon/mode/multiplex.js

@@ -14,12 +14,14 @@
 CodeMirror.multiplexingMode = function(outer /*, others */) {
   // Others should be {open, close, mode [, delimStyle] [, innerStyle]} objects
   var others = Array.prototype.slice.call(arguments, 1);
-  var n_others = others.length;
 
-  function indexOf(string, pattern, from) {
-    if (typeof pattern == "string") return string.indexOf(pattern, from);
+  function indexOf(string, pattern, from, returnEnd) {
+    if (typeof pattern == "string") {
+      var found = string.indexOf(pattern, from);
+      return returnEnd && found > -1 ? found + pattern.length : found;
+    }
     var m = pattern.exec(from ? string.slice(from) : string);
-    return m ? m.index + from : -1;
+    return m ? m.index + from + (returnEnd ? m[0].length : 0) : -1;
   }
 
   return {
@@ -42,11 +44,11 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
     token: function(stream, state) {
       if (!state.innerActive) {
         var cutOff = Infinity, oldContent = stream.string;
-        for (var i = 0; i < n_others; ++i) {
+        for (var i = 0; i < others.length; ++i) {
           var other = others[i];
           var found = indexOf(oldContent, other.open, stream.pos);
           if (found == stream.pos) {
-            stream.match(other.open);
+            if (!other.parseDelimiters) stream.match(other.open);
             state.innerActive = other;
             state.inner = CodeMirror.startState(other.mode, outer.indent ? outer.indent(state.outer, "") : 0);
             return other.delimStyle;
@@ -64,8 +66,8 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
           state.innerActive = state.inner = null;
           return this.token(stream, state);
         }
-        var found = curInner.close ? indexOf(oldContent, curInner.close, stream.pos) : -1;
-        if (found == stream.pos) {
+        var found = curInner.close ? indexOf(oldContent, curInner.close, stream.pos, curInner.parseDelimiters) : -1;
+        if (found == stream.pos && !curInner.parseDelimiters) {
           stream.match(curInner.close);
           state.innerActive = state.inner = null;
           return curInner.delimStyle;
@@ -74,6 +76,9 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         var innerToken = curInner.mode.token(stream, state.inner);
         if (found > -1) stream.string = oldContent;
 
+        if (found == stream.pos && curInner.parseDelimiters)
+          state.innerActive = state.inner = null;
+
         if (curInner.innerStyle) {
           if (innerToken) innerToken = innerToken + ' ' + curInner.innerStyle;
           else innerToken = curInner.innerStyle;
@@ -95,7 +100,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
         mode.blankLine(state.innerActive ? state.inner : state.outer);
       }
       if (!state.innerActive) {
-        for (var i = 0; i < n_others; ++i) {
+        for (var i = 0; i < others.length; ++i) {
           var other = others[i];
           if (other.open === "\n") {
             state.innerActive = other;