codemirror-rails 2.36 → 3.00

data/vendor/assets/javascripts/codemirror/utils/foldcode.js

@@ -1,15 +1,15 @@
 // 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, hideEnd) {
+CodeMirror.tagRangeFinder = function(cm, start) {
   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 xmlNAMERegExp = new RegExp("^[" + nameStartChar + "][" + nameChar + "]*");
 
-  var lineText = cm.getLine(line);
+  var lineText = cm.getLine(start.line);
   var found = false;
   var tag = null;
-  var pos = 0;
+  var pos = start.ch;
   while (!found) {
     pos = lineText.indexOf("<", pos);
     if (-1 == pos) // no tag on line
@@ -18,28 +18,26 @@ CodeMirror.tagRangeFinder = function(cm, line, hideEnd) {
       pos++;
       continue;
     }
-    // ok we weem to have a start tag
+    // ok we seem to have a start tag
     if (!lineText.substr(pos + 1).match(xmlNAMERegExp)) { // not a tag name...
       pos++;
       continue;
     }
     var gtPos = lineText.indexOf(">", pos + 1);
     if (-1 == gtPos) { // end of start tag not in line
-      var l = line + 1;
+      var l = start.line + 1;
       var foundGt = false;
       var lastLine = cm.lineCount();
       while (l < lastLine && !foundGt) {
         var lt = cm.getLine(l);
-        var gt = lt.indexOf(">");
-        if (-1 != gt) { // found a >
+        gtPos = lt.indexOf(">");
+        if (-1 != gtPos) { // found a >
           foundGt = true;
-          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
-              if (hideEnd === true) l++;
-              return l;
-            }
+          var slash = lt.lastIndexOf("/", gtPos);
+          if (-1 != slash && slash < gtPos) {
+            var str = lineText.substr(slash, gtPos - slash + 1);
+            if (!str.match( /\/\s*\>/ )) // yep, that's the end of empty tag
+              return;
           }
         }
         l++;
@@ -83,10 +81,10 @@ CodeMirror.tagRangeFinder = function(cm, line, hideEnd) {
 
   if (found) {
     var startTag = "(\\<\\/" + tag + "\\>)|(\\<" + tag + "\\>)|(\\<" + tag + "\\s)|(\\<" + tag + "$)";
-    var startTagRegExp = new RegExp(startTag, "g");
+    var startTagRegExp = new RegExp(startTag);
     var endTag = "</" + tag + ">";
     var depth = 1;
-    var l = line + 1;
+    var l = start.line + 1;
     var lastLine = cm.lineCount();
     while (l < lastLine) {
       lineText = cm.getLine(l);
@@ -97,10 +95,8 @@ CodeMirror.tagRangeFinder = function(cm, line, hideEnd) {
             depth--;
           else
             depth++;
-          if (!depth) {
-            if (hideEnd === true) l++;
-            return l;
-          }
+          if (!depth) return {from: {line: start.line, ch: gtPos + 1},
+                              to: {line: l, ch: match.index}};
         }
       }
       l++;
@@ -109,17 +105,18 @@ CodeMirror.tagRangeFinder = function(cm, line, hideEnd) {
   }
 };
 
-CodeMirror.braceRangeFinder = function(cm, line, hideEnd) {
-  var lineText = cm.getLine(line), at = lineText.length, startChar, tokenType;
+CodeMirror.braceRangeFinder = function(cm, start) {
+  var line = start.line, lineText = cm.getLine(line);
+  var at = lineText.length, startChar, tokenType;
   for (;;) {
     var found = lineText.lastIndexOf("{", at);
-    if (found < 0) break;
-    tokenType = cm.getTokenAt({line: line, ch: found}).className;
+    if (found < start.ch) break;
+    tokenType = cm.getTokenAt({line: line, ch: found}).type;
     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;
+  var count = 1, lastLine = cm.lineCount(), end, endCh;
   outer: for (var i = line + 1; i < lastLine; ++i) {
     var text = cm.getLine(i), pos = 0;
     for (;;) {
@@ -128,69 +125,58 @@ CodeMirror.braceRangeFinder = function(cm, line, hideEnd) {
       if (nextClose < 0) nextClose = text.length;
       pos = Math.min(nextOpen, nextClose);
       if (pos == text.length) break;
-      if (cm.getTokenAt({line: i, ch: pos + 1}).className == tokenType) {
+      if (cm.getTokenAt({line: i, ch: pos + 1}).type == tokenType) {
         if (pos == nextOpen) ++count;
-        else if (!--count) { end = i; break outer; }
+        else if (!--count) { end = i; endCh = pos; break outer; }
       }
       ++pos;
     }
   }
   if (end == null || end == line + 1) return;
-  if (hideEnd === true) end++;
-  return end;
+  return {from: {line: line, ch: startChar + 1},
+          to: {line: end, ch: endCh}};
 };
 
-CodeMirror.indentRangeFinder = function(cm, line) {
-  var tabSize = cm.getOption("tabSize");
-  var myIndent = cm.getLineHandle(line).indentation(tabSize), last;
-  for (var i = line + 1, end = cm.lineCount(); i < end; ++i) {
-    var handle = cm.getLineHandle(i);
-    if (!/^\s*$/.test(handle.text)) {
-      if (handle.indentation(tabSize) <= myIndent) break;
-      last = i;
-    }
+CodeMirror.indentRangeFinder = function(cm, start) {
+  var tabSize = cm.getOption("tabSize"), firstLine = cm.getLine(start.line);
+  var myIndent = CodeMirror.countColumn(firstLine, null, tabSize);
+  for (var i = start.line + 1, end = cm.lineCount(); i < end; ++i) {
+    var curLine = cm.getLine(i);
+    if (CodeMirror.countColumn(curLine, null, tabSize) < myIndent)
+      return {from: {line: start.line, ch: firstLine.length},
+              to: {line: i, ch: curLine.length}};
   }
-  if (!last) return null;
-  return last + 1;
 };
 
-CodeMirror.newFoldFunction = function(rangeFinder, markText, hideEnd) {
-  var folded = [];
-  if (markText == null) markText = '<div style="position: absolute; left: 2px; color:#600">&#x25bc;</div>%N%';
-
-  function isFolded(cm, n) {
-    for (var i = 0; i < folded.length; ++i) {
-      var start = cm.lineInfo(folded[i].start);
-      if (!start) folded.splice(i--, 1);
-      else if (start.line == n) return {pos: i, region: folded[i]};
-    }
+CodeMirror.newFoldFunction = function(rangeFinder, widget) {
+  if (widget == null) widget = "\u2194";
+  if (typeof widget == "string") {
+    var text = document.createTextNode(widget);
+    widget = document.createElement("span");
+    widget.appendChild(text);
+    widget.className = "CodeMirror-foldmarker";
   }
 
-  function expand(cm, region) {
-    cm.clearMarker(region.start);
-    for (var i = 0; i < region.hidden.length; ++i)
-      cm.showLine(region.hidden[i]);
-  }
+  return function(cm, pos) {
+    if (typeof pos == "number") pos = {line: pos, ch: 0};
+    var range = rangeFinder(cm, pos);
+    if (!range) return;
 
-  return function(cm, line) {
-    cm.operation(function() {
-      var known = isFolded(cm, line);
-      if (known) {
-        folded.splice(known.pos, 1);
-        expand(cm, known.region);
-      } else {
-        var end = rangeFinder(cm, line, hideEnd);
-        if (end == null) return;
-        var hidden = [];
-        for (var i = line + 1; i < end; ++i) {
-          var handle = cm.hideLine(i);
-          if (handle) hidden.push(handle);
-        }
-        var first = cm.setMarker(line, markText);
-        var region = {start: first, hidden: hidden};
-        cm.onDeleteLine(first, function() { expand(cm, region); });
-        folded.push(region);
+    var present = cm.findMarksAt(range.from), cleared = 0;
+    for (var i = 0; i < present.length; ++i) {
+      if (present[i].__isFold) {
+        ++cleared;
+        present[i].clear();
       }
+    }
+    if (cleared) return;
+
+    var myWidget = widget.cloneNode(true);
+    CodeMirror.on(myWidget, "mousedown", function() {myRange.clear();});
+    var myRange = cm.markText(range.from, range.to, {
+      replacedWith: myWidget,
+      clearOnEnter: true,
+      __isFold: true
     });
   };
 };

data/vendor/assets/javascripts/codemirror/utils/formatting.js

@@ -1,138 +1,39 @@
-// ============== Formatting extensions ============================
 (function() {
-  // Define extensions for a few modes
+
   CodeMirror.extendMode("css", {
     commentStart: "/*",
     commentEnd: "*/",
-    wordWrapChars: [";", "\\{", "\\}"],
-    autoFormatLineBreaks: function (text) {
-      return text.replace(new RegExp("(;|\\{|\\})([^\r\n])", "g"), "$1\n$2");
+    newlineAfterToken: function(_type, content) {
+      return /^[;{}]$/.test(content);
     }
   });
 
-  function jsNonBreakableBlocks(text) {
-    var nonBreakableRegexes = [/for\s*?\((.*?)\)/,
-                               /\"(.*?)(\"|$)/,
-                               /\'(.*?)(\'|$)/,
-                               /\/\*(.*?)(\*\/|$)/,
-                               /\/\/.*/];
-    var nonBreakableBlocks = [];
-    for (var i = 0; i < nonBreakableRegexes.length; i++) {
-      var curPos = 0;
-      while (curPos < text.length) {
-        var m = text.substr(curPos).match(nonBreakableRegexes[i]);
-        if (m != null) {
-          nonBreakableBlocks.push({
-            start: curPos + m.index,
-            end: curPos + m.index + m[0].length
-          });
-          curPos += m.index + Math.max(1, m[0].length);
-        }
-        else { // No more matches
-          break;
-        }
-      }
-    }
-    nonBreakableBlocks.sort(function (a, b) {
-      return a.start - b.start;
-    });
-
-    return nonBreakableBlocks;
-  }
-
   CodeMirror.extendMode("javascript", {
     commentStart: "/*",
     commentEnd: "*/",
-    wordWrapChars: [";", "\\{", "\\}"],
-
-    autoFormatLineBreaks: function (text) {
-      var curPos = 0;
-      var split = this.jsonMode ? function(str) {
-        return str.replace(/([,{])/g, "$1\n").replace(/}/g, "\n}");
-      } : function(str) {
-        return str.replace(/(;|\{|\})([^\r\n;])/g, "$1\n$2");
-      };
-      var nonBreakableBlocks = jsNonBreakableBlocks(text), res = "";
-      if (nonBreakableBlocks != null) {
-        for (var i = 0; i < nonBreakableBlocks.length; i++) {
-          if (nonBreakableBlocks[i].start > curPos) { // Break lines till the block
-            res += split(text.substring(curPos, nonBreakableBlocks[i].start));
-            curPos = nonBreakableBlocks[i].start;
-          }
-          if (nonBreakableBlocks[i].start <= curPos
-              && nonBreakableBlocks[i].end >= curPos) { // Skip non-breakable block
-            res += text.substring(curPos, nonBreakableBlocks[i].end);
-            curPos = nonBreakableBlocks[i].end;
-          }
-        }
-        if (curPos < text.length)
-          res += split(text.substr(curPos));
+    // FIXME semicolons inside of for
+    newlineAfterToken: function(_type, content, textAfter, state) {
+      if (this.jsonMode) {
+        return /^[\[,{]$/.test(content) || /^}/.test(textAfter);
       } else {
-        res = split(text);
+        if (content == ";" && state.lexical && state.lexical.type == ")") return false;
+        return /^[;{}]$/.test(content) && !/^;/.test(textAfter);
       }
-      return res.replace(/^\n*|\n*$/, "");
     }
   });
 
   CodeMirror.extendMode("xml", {
     commentStart: "<!--",
     commentEnd: "-->",
-    wordWrapChars: [">"],
-
-    autoFormatLineBreaks: function (text) {
-      var lines = text.split("\n");
-      var reProcessedPortion = new RegExp("(^\\s*?<|^[^<]*?)(.+)(>\\s*?$|[^>]*?$)");
-      var reOpenBrackets = new RegExp("<", "g");
-      var reCloseBrackets = new RegExp("(>)([^\r\n])", "g");
-      for (var i = 0; i < lines.length; i++) {
-        var mToProcess = lines[i].match(reProcessedPortion);
-        if (mToProcess != null && mToProcess.length > 3) { // The line starts with whitespaces and ends with whitespaces
-          lines[i] = mToProcess[1]
-            + mToProcess[2].replace(reOpenBrackets, "\n$&").replace(reCloseBrackets, "$1\n$2")
-            + mToProcess[3];
-          continue;
-        }
-      }
-      return lines.join("\n");
+    newlineAfterToken: function(type, content, textAfter) {
+      return type == "tag" && />$/.test(content) || /^</.test(textAfter);
     }
   });
 
-  function localModeAt(cm, pos) {
-    return CodeMirror.innerMode(cm.getMode(), cm.getTokenAt(pos).state).mode;
-  }
-
-  function enumerateModesBetween(cm, line, start, end) {
-    var outer = cm.getMode(), text = cm.getLine(line);
-    if (end == null) end = text.length;
-    if (!outer.innerMode) return [{from: start, to: end, mode: outer}];
-    var state = cm.getTokenAt({line: line, ch: start}).state;
-    var mode = CodeMirror.innerMode(outer, state).mode;
-    var found = [], stream = new CodeMirror.StringStream(text);
-    stream.pos = stream.start = start;
-    for (;;) {
-      outer.token(stream, state);
-      var curMode = CodeMirror.innerMode(outer, state).mode;
-      if (curMode != mode) {
-        var cut = stream.start;
-        // Crappy heuristic to deal with the fact that a change in
-        // mode can occur both at the end and the start of a token,
-        // and we don't know which it was.
-        if (mode.name == "xml" && text.charAt(stream.pos - 1) == ">") cut = stream.pos;
-        found.push({from: start, to: cut, mode: mode});
-        start = cut;
-        mode = curMode;
-      }
-      if (stream.pos >= end) break;
-      stream.start = stream.pos;
-    }
-    if (start < end) found.push({from: start, to: end, mode: mode});
-    return found;
-  }
-
   // Comment/uncomment the specified range
   CodeMirror.defineExtension("commentRange", function (isComment, from, to) {
-    var curMode = localModeAt(this, from), cm = this;
-    this.operation(function() {
+    var cm = this, curMode = CodeMirror.innerMode(cm.getMode(), cm.getTokenAt(from).state).mode;
+    cm.operation(function() {
       if (isComment) { // Comment range
         cm.replaceRange(curMode.commentEnd, to);
         cm.replaceRange(curMode.commentStart, from);
@@ -168,27 +69,38 @@
   // Applies automatic formatting to the specified range
   CodeMirror.defineExtension("autoFormatRange", function (from, to) {
     var cm = this;
-    cm.operation(function () {
-      for (var cur = from.line, end = to.line; cur <= end; ++cur) {
-        var f = {line: cur, ch: cur == from.line ? from.ch : 0};
-        var t = {line: cur, ch: cur == end ? to.ch : null};
-        var modes = enumerateModesBetween(cm, cur, f.ch, t.ch), mangled = "";
-        var text = cm.getRange(f, t);
-        for (var i = 0; i < modes.length; ++i) {
-          var part = modes.length > 1 ? text.slice(modes[i].from, modes[i].to) : text;
-          if (mangled) mangled += "\n";
-          if (modes[i].mode.autoFormatLineBreaks) {
-            mangled += modes[i].mode.autoFormatLineBreaks(part);
-          } else mangled += text;
-        }
-        if (mangled != text) {
-          for (var count = 0, pos = mangled.indexOf("\n"); pos != -1; pos = mangled.indexOf("\n", pos + 1), ++count) {}
-          cm.replaceRange(mangled, f, t);
-          cur += count;
-          end += count;
+    var outer = cm.getMode(), text = cm.getRange(from, to).split("\n");
+    var state = CodeMirror.copyState(outer, cm.getTokenAt(from).state);
+    var tabSize = cm.getOption("tabSize");
+
+    var out = "", lines = 0, atSol = from.ch == 0;
+    function newline() {
+      out += "\n";
+      atSol = true;
+      ++lines;
+    }
+
+    for (var i = 0; i < text.length; ++i) {
+      var stream = new CodeMirror.StringStream(text[i], tabSize);
+      while (!stream.eol()) {
+        var inner = CodeMirror.innerMode(outer, state);
+        var style = outer.token(stream, state), cur = stream.current();
+        stream.start = stream.pos;
+        if (!atSol || /\S/.test(cur)) {
+          out += cur;
+          atSol = false;
         }
+        if (!atSol && inner.mode.newlineAfterToken &&
+            inner.mode.newlineAfterToken(style, cur, stream.string.slice(stream.pos) || text[i+1] || "", inner.state))
+          newline();
       }
-      for (var cur = from.line + 1; cur <= end; ++cur)
+      if (!stream.pos && outer.blankLine) outer.blankLine(state);
+      if (!atSol) newline();
+    }
+
+    cm.operation(function () {
+      cm.replaceRange(out, from, to);
+      for (var cur = from.line + 1, end = from.line + lines; cur <= end; ++cur)
         cm.indentLine(cur, "smart");
       cm.setSelection(from, cm.getCursor(false));
     });

data/vendor/assets/javascripts/codemirror/utils/javascript-hint.js

@@ -16,16 +16,16 @@
     return arr.indexOf(item) != -1;
   }
 
-  function scriptHint(editor, keywords, getToken) {
+  function scriptHint(editor, keywords, getToken, options) {
     // Find the token at the cursor
     var cur = editor.getCursor(), token = getToken(editor, cur), tprop = token;
     // If it's not a 'word-style' token, ignore the token.
 		if (!/^[\w$_]*$/.test(token.string)) {
       token = tprop = {start: cur.ch, end: cur.ch, string: "", state: token.state,
-                       className: token.string == "." ? "property" : null};
+                       type: token.string == "." ? "property" : null};
     }
     // If it is a property, find out what it is a property of.
-    while (tprop.className == "property") {
+    while (tprop.type == "property") {
       tprop = getToken(editor, {line: cur.line, ch: tprop.start});
       if (tprop.string != ".") return;
       tprop = getToken(editor, {line: cur.line, ch: tprop.start});
@@ -40,21 +40,22 @@
           }
         } while (level > 0);
         tprop = getToken(editor, {line: cur.line, ch: tprop.start});
-				if (tprop.className == 'variable')
-					tprop.className = 'function';
-				else return; // no clue
+	if (tprop.type == 'variable')
+	  tprop.type = 'function';
+	else return; // no clue
       }
       if (!context) var context = [];
       context.push(tprop);
     }
-    return {list: getCompletions(token, context, keywords),
+    return {list: getCompletions(token, context, keywords, options),
             from: {line: cur.line, ch: token.start},
             to: {line: cur.line, ch: token.end}};
   }
 
-  CodeMirror.javascriptHint = function(editor) {
+  CodeMirror.javascriptHint = function(editor, options) {
     return scriptHint(editor, javascriptKeywords,
-                      function (e, cur) {return e.getTokenAt(cur);});
+                      function (e, cur) {return e.getTokenAt(cur);},
+                      options);
   };
 
   function getCoffeeScriptToken(editor, cur) {
@@ -65,18 +66,18 @@
     if (cur.ch == token.start + 1 && token.string.charAt(0) == '.') {
       token.end = token.start;
       token.string = '.';
-      token.className = "property";
+      token.type = "property";
     }
     else if (/^\.[\w$_]*$/.test(token.string)) {
-      token.className = "property";
+      token.type = "property";
       token.start++;
       token.string = token.string.replace(/\./, '');
     }
     return token;
   }
 
-  CodeMirror.coffeescriptHint = function(editor) {
-    return scriptHint(editor, coffeescriptKeywords, getCoffeeScriptToken);
+  CodeMirror.coffeescriptHint = function(editor, options) {
+    return scriptHint(editor, coffeescriptKeywords, getCoffeeScriptToken, options);
   };
 
   var stringProps = ("charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight " +
@@ -89,7 +90,7 @@
   var coffeescriptKeywords = ("and break catch class continue delete do else extends false finally for " +
                   "if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes").split(" ");
 
-  function getCompletions(token, context, keywords) {
+  function getCompletions(token, context, keywords, options) {
     var found = [], start = token.string;
     function maybeAdd(str) {
       if (str.indexOf(start) == 0 && !arrayContains(found, str)) found.push(str);
@@ -105,13 +106,15 @@
       // If this is a property, see if it belongs to some object we can
       // find in the current environment.
       var obj = context.pop(), base;
-      if (obj.className == "variable")
-        base = window[obj.string];
-      else if (obj.className == "string")
+      if (obj.type == "variable") {
+        if (options && options.additionalContext)
+          base = options.additionalContext[obj.string];
+        base = base || window[obj.string];
+      } else if (obj.type == "string") {
         base = "";
-      else if (obj.className == "atom")
+      } else if (obj.type == "atom") {
         base = 1;
-      else if (obj.className == "function") {
+      } else if (obj.type == "function") {
         if (window.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') &&
             (typeof window.jQuery == 'function'))
           base = window.jQuery();