Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix

10 files changed, 298 insertions, 62 deletions

diff --git a/imports/codemirror/lib/util/closetag.js b/imports/codemirror/lib/util/closetag.js
index 44c2b435..20a43b9d 100644
--- a/imports/codemirror/lib/util/closetag.js
+++ b/imports/codemirror/lib/util/closetag.js
@@ -10,7 +10,6 @@
  * following CodeMirror modes and will ignore all others:

  * - htmlmixed

  * - xml

- * - xmlpure

  *

  * See demos/closetag.html for a usage example.

  * 

@@ -104,33 +103,6 @@
                                 }

                         }

                 

-                } else if (mode == 'xmlpure') {

-

-                        var pos = cm.getCursor();

-                        var tok = cm.getTokenAt(pos);

-                        var tagName = tok.state.context.tagName;

-

-                        if (ch == '>') {

-                                // <foo>                        tagName=foo, string=foo

-                                // <foo />                      tagName=foo, string=/           # ignore

-                                // <foo></foo>          tagName=foo, string=/foo        # ignore

-                                if (tok.string == tagName) {

-                                        cm.replaceSelection('>'); // parity w/html modes

-                                        pos = {line: pos.line, ch: pos.ch + 1};

-                                        cm.setCursor(pos);

-                                        

-                                        insertEndTag(cm, indent, pos, tagName);

-                                        return;

-                                }

-                                

-                        } else if (ch == '/') {

-                                // <foo /                       tagName=foo, string=            # ignore

-                                // <foo></                      tagName=foo, string=<

-                                if (tok.string == '<') {

-                                        completeEndTag(cm, pos, tagName);

-                                        return;

-                                }

-                        }

                 }

                 

                 throw CodeMirror.Pass; // Bubble if not handled

diff --git a/imports/codemirror/lib/util/foldcode.js b/imports/codemirror/lib/util/foldcode.js
index b700d860..02cfb50a 100644
--- a/imports/codemirror/lib/util/foldcode.js
+++ b/imports/codemirror/lib/util/foldcode.js
@@ -1,9 +1,9 @@
 // the tagRangeFinder function is
 //   Copyright (C) 2011 by Daniel Glazman <daniel@glazman.org>
 // released under the MIT license (../../LICENSE) like the rest of CodeMirror
-CodeMirror.tagRangeFinder = function(cm, line) {
+CodeMirror.tagRangeFinder = function(cm, line, hideEnd) {
   var nameStartChar = "A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD";
-  var nameChar = nameStartChar + "\-\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040";
+  var nameChar = nameStartChar + "\-\:\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040";
   var xmlNAMERegExp = new RegExp("^[" + nameStartChar + "][" + nameChar + "]*");
 
   var lineText = cm.getLine(line);
@@ -36,8 +36,10 @@ CodeMirror.tagRangeFinder = function(cm, line) {
           var slash = lt.lastIndexOf("/", gt);
           if (-1 != slash && slash < gt) {
             var str = lineText.substr(slash, gt - slash + 1);
-            if (!str.match( /\/\s*\>/ )) // yep, that's the end of empty tag
-              return l+1;
+            if (!str.match( /\/\s*\>/ )) { // yep, that's the end of empty tag
+              if (hideEnd === true) l++;
+              return l;
+            }
           }
         }
         l++;
@@ -95,8 +97,10 @@ CodeMirror.tagRangeFinder = function(cm, line) {
             depth--;
           else
             depth++;
-          if (!depth)
-            return l+1;
+          if (!depth) {
+            if (hideEnd === true) l++;
+            return l;
+          }
         }
       }
       l++;
@@ -105,11 +109,16 @@ CodeMirror.tagRangeFinder = function(cm, line) {
   }
 };
 
-CodeMirror.braceRangeFinder = function(cm, line) {
-  var lineText = cm.getLine(line);
-  var startChar = lineText.lastIndexOf("{");
-  if (startChar < 0 || lineText.lastIndexOf("}") > startChar) return;
-  var tokenType = cm.getTokenAt({line: line, ch: startChar}).className;
+CodeMirror.braceRangeFinder = function(cm, line, hideEnd) {
+  var lineText = cm.getLine(line), at = lineText.length, startChar, tokenType;
+  for (;;) {
+    var found = lineText.lastIndexOf("{", at);
+    if (found < 0) break;
+    tokenType = cm.getTokenAt({line: line, ch: found}).className;
+    if (!/^(comment|string)/.test(tokenType)) { startChar = found; break; }
+    at = found - 1;
+  }
+  if (startChar == null || lineText.lastIndexOf("}") > startChar) return;
   var count = 1, lastLine = cm.lineCount(), end;
   outer: for (var i = line + 1; i < lastLine; ++i) {
     var text = cm.getLine(i), pos = 0;
@@ -127,6 +136,7 @@ CodeMirror.braceRangeFinder = function(cm, line) {
     }
   }
   if (end == null || end == line + 1) return;
+  if (hideEnd === true) end++;
   return end;
 };
 
@@ -144,7 +154,7 @@ CodeMirror.indentRangeFinder = function(cm, line) {
   return last + 1;
 };
 
-CodeMirror.newFoldFunction = function(rangeFinder, markText) {
+CodeMirror.newFoldFunction = function(rangeFinder, markText, hideEnd) {
   var folded = [];
   if (markText == null) markText = '<div style="position: absolute; left: 2px; color:#600">&#x25bc;</div>%N%';
 
@@ -169,7 +179,7 @@ CodeMirror.newFoldFunction = function(rangeFinder, markText) {
         folded.splice(known.pos, 1);
         expand(cm, known.region);
       } else {
-        var end = rangeFinder(cm, line);
+        var end = rangeFinder(cm, line, hideEnd);
         if (end == null) return;
         var hidden = [];
         for (var i = line + 1; i < end; ++i) {
diff --git a/imports/codemirror/lib/util/formatting.js b/imports/codemirror/lib/util/formatting.js
index e1891191..3a1a9873 100644
--- a/imports/codemirror/lib/util/formatting.js
+++ b/imports/codemirror/lib/util/formatting.js
@@ -84,7 +84,8 @@ CodeMirror.modeExtensions["css"] = {
   commentStart: "/*",
   commentEnd: "*/",
   wordWrapChars: [";", "\\{", "\\}"],
-  autoFormatLineBreaks: function (text) {
+  autoFormatLineBreaks: function (text, startPos, endPos) {
+    text = text.substring(startPos, endPos);
     return text.replace(new RegExp("(;|\\{|\\})([^\r\n])", "g"), "$1\n$2");
   }
 };
@@ -125,7 +126,8 @@ CodeMirror.modeExtensions["javascript"] = {
     return nonBreakableBlocks;
   },
 
-  autoFormatLineBreaks: function (text) {
+  autoFormatLineBreaks: function (text, startPos, endPos) {
+    text = text.substring(startPos, endPos);
     var curPos = 0;
     var reLinesSplitter = new RegExp("(;|\\{|\\})([^\r\n])", "g");
     var nonBreakableBlocks = this.getNonBreakableBlocks(text);
@@ -158,7 +160,8 @@ CodeMirror.modeExtensions["xml"] = {
   commentEnd: "-->",
   wordWrapChars: [">"],
 
-  autoFormatLineBreaks: function (text) {
+  autoFormatLineBreaks: function (text, startPos, endPos) {
+    text = text.substring(startPos, endPos);
     var lines = text.split("\n");
     var reProcessedPortion = new RegExp("(^\\s*?<|^[^<]*?)(.+)(>\\s*?$|[^>]*?$)");
     var reOpenBrackets = new RegExp("<", "g");
diff --git a/imports/codemirror/lib/util/loadmode.js b/imports/codemirror/lib/util/loadmode.js
new file mode 100644
index 00000000..48d5a7ab
--- /dev/null
+++ b/imports/codemirror/lib/util/loadmode.js
@@ -0,0 +1,51 @@
+(function() {
+  if (!CodeMirror.modeURL) CodeMirror.modeURL = "../mode/%N/%N.js";
+
+  var loading = {};
+  function splitCallback(cont, n) {
+    var countDown = n;
+    return function() { if (--countDown == 0) cont(); }
+  }
+  function ensureDeps(mode, cont) {
+    var deps = CodeMirror.modes[mode].dependencies;
+    if (!deps) return cont();