codemirror-rails 2.24 → 2.32

data/vendor/assets/javascripts/codemirror/modes/pascal.js

@@ -46,7 +46,7 @@ CodeMirror.defineMode("pascal", function(config) {
     var cur = stream.current();
     if (keywords.propertyIsEnumerable(cur)) return "keyword";
     if (atoms.propertyIsEnumerable(cur)) return "atom";
-    return "word";
+    return "variable";
   }
 
   function tokenString(quote) {

data/vendor/assets/javascripts/codemirror/modes/pig.js

@@ -112,8 +112,8 @@ CodeMirror.defineMode("pig", function(config, parserConfig) {
 			// is it one of the listed types?
 			if (types && types.propertyIsEnumerable(stream.current().toUpperCase()))
 				return ("keyword", "variable-3")
-			// default is a 'word'
-			return ret("word", "pig-word");
+			// default is a 'variable'
+			return ret("variable", "pig-word");
 		}
 	}
 	

data/vendor/assets/javascripts/codemirror/modes/plsql.js

@@ -72,8 +72,8 @@ CodeMirror.defineMode("plsql", function(config, parserConfig) {
       if (types && types.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "variable-2");
       // is it one of the listed sqlplus keywords?
       if (sqlplus && sqlplus.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "variable-3");
-      // default: just a "word"
-      return ret("word", "plsql-word");
+      // default: just a "variable"
+      return ret("word", "variable");
     }
   }
 

data/vendor/assets/javascripts/codemirror/modes/python.js

@@ -249,26 +249,23 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
 
         // Handle '.' connected identifiers
         if (current === '.') {
-            style = state.tokenize(stream, state);
-            current = stream.current();
-            if (style === 'variable' || style === 'builtin') {
-                return 'variable';
-            } else {
-                return ERRORCLASS;
+            style = stream.match(identifiers, false) ? null : ERRORCLASS;
+            if (style === null && state.lastToken === 'meta') {
+                // Apply 'meta' style to '.' connected identifiers when
+                // appropriate.
+                style = 'meta';
             }
+            return style;
         }
         
         // Handle decorators
         if (current === '@') {
-            style = state.tokenize(stream, state);
-            current = stream.current();
-            if (style === 'variable'
-                || current === '@staticmethod'
-                || current === '@classmethod') {
-                return 'meta';
-            } else {
-                return ERRORCLASS;
-            }
+            return stream.match(identifiers, false) ? 'meta' : ERRORCLASS;
+        }
+
+        if ((style === 'variable' || style === 'builtin')
+            && state.lastToken === 'meta') {
+            style = 'meta';
         }
         
         // Handle scope changes.
@@ -317,7 +314,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
         token: function(stream, state) {
             var style = tokenLexer(stream, state);
             
-            state.lastToken = {style:style, content: stream.current()};
+            state.lastToken = style;
             
             if (stream.eol() && stream.lambda) {
                 state.lambda = false;

data/vendor/assets/javascripts/codemirror/modes/ruby.js

@@ -30,7 +30,7 @@ CodeMirror.defineMode("ruby", function(config, parserConfig) {
       return "comment";
     }
     if (stream.eatSpace()) return null;
-    var ch = stream.next();
+    var ch = stream.next(), m;
     if (ch == "`" || ch == "'" || ch == '"' ||
         (ch == "/" && !stream.eol() && stream.peek() != " ")) {
       return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
@@ -46,13 +46,8 @@ CodeMirror.defineMode("ruby", function(config, parserConfig) {
     } else if (ch == "#") {
       stream.skipToEnd();
       return "comment";
-    } else if (ch == "<" && stream.eat("<")) {
-      stream.eat("-");
-      stream.eat(/[\'\"\`]/);
-      var match = stream.match(/^\w+/);
-      stream.eat(/[\'\"\`]/);
-      if (match) return chain(readHereDoc(match[0]), stream, state);
-      return null;
+    } else if (ch == "<" && (m = stream.match(/^<-?[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) {
+      return chain(readHereDoc(m[1]), stream, state);
     } else if (ch == "0") {
       if (stream.eat("x")) stream.eatWhile(/[\da-fA-F]/);
       else if (stream.eat("b")) stream.eatWhile(/[01]/);

data/vendor/assets/javascripts/codemirror/modes/scheme.js

@@ -5,7 +5,7 @@ CodeMirror.defineMode("scheme", function (config, mode) {
     var BUILTIN = "builtin", COMMENT = "comment", STRING = "string",
         ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD="keyword";
     var INDENT_WORD_SKIP = 2, KEYWORDS_SKIP = 1;
-    
+
     function makeKeywords(str) {
         var obj = {}, words = str.split(" ");
         for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
@@ -14,7 +14,6 @@ CodeMirror.defineMode("scheme", function (config, mode) {
 
     var keywords = makeKeywords("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?");
     var indentKeys = makeKeywords("define let letrec let* lambda");
-    
 
     function stateStack(indent, type, prev) { // represents a state stack object
         this.indent = indent;
@@ -29,21 +28,29 @@ CodeMirror.defineMode("scheme", function (config, mode) {
     function popStack(state) {
         state.indentStack = state.indentStack.prev;
     }
-    
-    /**
-     * Scheme numbers are complicated unfortunately.
-     * Checks if we're looking at a number, which might be possibly a fraction.
-     * Also checks that it is not part of a longer identifier. Returns true/false accordingly.
-     */
-    function isNumber(ch, stream){ 
-        if(/[0-9]/.exec(ch) != null){ 
-            stream.eatWhile(/[0-9]/);
-            stream.eat(/\//);
-            stream.eatWhile(/[0-9]/);
-            if (stream.eol() || !(/[a-zA-Z\-\_\/]/.exec(stream.peek()))) return true;
-            stream.backUp(stream.current().length - 1); // undo all the eating
+
+    var binaryMatcher = new RegExp(/^(?:[-+]i|[-+][01]+#*(?:\/[01]+#*)?i|[-+]?[01]+#*(?:\/[01]+#*)?@[-+]?[01]+#*(?:\/[01]+#*)?|[-+]?[01]+#*(?:\/[01]+#*)?[-+](?:[01]+#*(?:\/[01]+#*)?)?i|[-+]?[01]+#*(?:\/[01]+#*)?)(?=[()\s;"]|$)/i);
+    var octalMatcher = new RegExp(/^(?:[-+]i|[-+][0-7]+#*(?:\/[0-7]+#*)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?@[-+]?[0-7]+#*(?:\/[0-7]+#*)?|[-+]?[0-7]+#*(?:\/[0-7]+#*)?[-+](?:[0-7]+#*(?:\/[0-7]+#*)?)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?)(?=[()\s;"]|$)/i);
+    var hexMatcher = new RegExp(/^(?:[-+]i|[-+][\da-f]+#*(?:\/[\da-f]+#*)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?@[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?[-+](?:[\da-f]+#*(?:\/[\da-f]+#*)?)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?)(?=[()\s;"]|$)/i);
+    var decimalMatcher = new RegExp(/^(?:[-+]i|[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)i|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)@[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)?i|(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*))(?=[()\s;"]|$)/i);
+
+    function isBinaryNumber (stream) {
+        return stream.match(binaryMatcher);
+    }
+
+    function isOctalNumber (stream) {
+        return stream.match(octalMatcher);
+    }
+
+    function isDecimalNumber (stream, backup) {
+        if (backup === true) {
+            stream.backUp(1);
         }
-        return false;
+        return stream.match(decimalMatcher);
+    }
+
+    function isHexNumber (stream) {
+        return stream.match(hexMatcher);
     }
 
     return {
@@ -67,13 +74,13 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                 return null;
             }
             var returnType = null;
-            
+
             switch(state.mode){
                 case "string": // multi-line string parsing mode
                     var next, escaped = false;
                     while ((next = stream.next()) != null) {
                         if (next == "\"" && !escaped) {
-    
+
                             state.mode = false;
                             break;
                         }
@@ -85,7 +92,7 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                     var next, maybeEnd = false;
                     while ((next = stream.next()) != null) {
                         if (next == "#" && maybeEnd) {
-    
+
                             state.mode = false;
                             break;
                         }
@@ -106,52 +113,73 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                     }
                 default: // default parsing mode
                     var ch = stream.next();
-        
+
                     if (ch == "\"") {
                         state.mode = "string";
                         returnType = STRING;
-        
+
                     } else if (ch == "'") {
                         returnType = ATOM;
                     } else if (ch == '#') {
-                        if (stream.eat("|")) {					// Multi-line comment
+                        if (stream.eat("|")) {                    // Multi-line comment
                             state.mode = "comment"; // toggle to comment mode
                             returnType = COMMENT;
-                        } else if (stream.eat(/[tf]/)) {			// #t/#f (atom)
+                        } else if (stream.eat(/[tf]/i)) {            // #t/#f (atom)
                             returnType = ATOM;
-                        } else if (stream.eat(';')) {				// S-Expr comment
+                        } else if (stream.eat(';')) {                // S-Expr comment
                             state.mode = "s-expr-comment";
                             returnType = COMMENT;
+                        } else {
+                            var numTest = null, hasExactness = false, hasRadix = true;
+                            if (stream.eat(/[ei]/i)) {
+                                hasExactness = true;
+                            } else {
+                                stream.backUp(1);       // must be radix specifier
+                            }
+                            if (stream.match(/^#b/i)) {
+                                numTest = isBinaryNumber;
+                            } else if (stream.match(/^#o/i)) {
+                                numTest = isOctalNumber;
+                            } else if (stream.match(/^#x/i)) {
+                                numTest = isHexNumber;
+                            } else if (stream.match(/^#d/i)) {
+                                numTest = isDecimalNumber;
+                            } else if (stream.match(/^[-+0-9.]/, false)) {
+                                hasRadix = false;
+                                numTest = isDecimalNumber;
+                            // re-consume the intial # if all matches failed
+                            } else if (!hasExactness) {
+                                stream.eat('#');
+                            }
+                            if (numTest != null) {
+                                if (hasRadix && !hasExactness) {
+                                    // consume optional exactness after radix
+                                    stream.match(/^#[ei]/i);
+                                }
+                                if (numTest(stream))
+                                    returnType = NUMBER;
+                            }
                         }
-        
+                    } else if (/^[-+0-9.]/.test(ch) && isDecimalNumber(stream, true)) { // match non-prefixed number, must be decimal
+                        returnType = NUMBER;
                     } else if (ch == ";") { // comment
                         stream.skipToEnd(); // rest of the line is a comment
                         returnType = COMMENT;
-                    } else if (ch == "-"){
-                        
-                        if(!isNaN(parseInt(stream.peek()))){
-                            stream.eatWhile(/[\/0-9]/);
-                            returnType = NUMBER;
-                        }else{                            
-                            returnType = null;
-                        }
-                    } else if (isNumber(ch,stream)){
-                        returnType = NUMBER;
                     } else if (ch == "(" || ch == "[") {
                         var keyWord = ''; var indentTemp = stream.column();
                         /**
-                        Either 
+                        Either
                         (indent-word ..
                         (non-indent-word ..
                         (;something else, bracket, etc.
                         */
-        
+
                         while ((letter = stream.eat(/[^\s\(\[\;\)\]]/)) != null) {
                             keyWord += letter;
                         }
-        
+
                         if (keyWord.length > 0 && indentKeys.propertyIsEnumerable(keyWord)) { // indent-word
-        
+
                             pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
                         } else { // non-indent word
                             // we continue eating the spaces
@@ -165,15 +193,15 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                             }
                         }
                         stream.backUp(stream.current().length - 1); // undo all the eating
-                        
+
                         if(typeof state.sExprComment == "number") state.sExprComment++;
-                        
+
                         returnType = BRACKET;
                     } else if (ch == ")" || ch == "]") {
                         returnType = BRACKET;
                         if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : "[")) {
                             popStack(state);
-                            
+
                             if(typeof state.sExprComment == "number"){
                                 if(--state.sExprComment == 0){
                                     returnType = COMMENT; // final closing bracket
@@ -182,11 +210,11 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                             }
                         }
                     } else {
-                        stream.eatWhile(/[\w\$_\-]/);
-        
+                        stream.eatWhile(/[\w\$_\-!$%&*+\.\/:<=>?@\^~]/);
+
                         if (keywords && keywords.propertyIsEnumerable(stream.current())) {
                             returnType = BUILTIN;
-                        }else returnType = null;
+                        } else returnType = "variable";
                     }
             }
             return (typeof state.sExprComment == "number") ? COMMENT : returnType;
@@ -199,4 +227,4 @@ CodeMirror.defineMode("scheme", function (config, mode) {
     };
 });
 
-CodeMirror.defineMIME("text/x-scheme", "scheme");
+CodeMirror.defineMIME("text/x-scheme", "scheme");

data/vendor/assets/javascripts/codemirror/modes/shell.js

@@ -1,8 +1,26 @@
 CodeMirror.defineMode('shell', function(config) {
 
-  var atoms = ['true','false'],
-      keywords = ['if','then','do','else','elif','while','until','for','in','esac','fi','fin','fil','done','exit','set','unset','export','function'],
-      commands = ['ab','awk','bash','beep','cat','cc','cd','chown','chmod','chroot','clear','cp','curl','cut','diff','echo','find','gawk','gcc','get','git','grep','kill','killall','ls','make','mkdir','openssl','mv','nc','node','npm','ping','ps','restart','rm','rmdir','sed','service','sh','shopt','shred','source','sort','sleep','ssh','start','stop','su','sudo','tee','telnet','top','touch','vi','vim','wall','wc','wget','who','write','yes','zsh'];
+  var words = {};
+  function define(style, string) {
+    var split = string.split(' ');
+    for(var i = 0; i < split.length; i++) {
+      words[split[i]] = style;
+    }
+  };
+
+  // Atoms
+  define('atom', 'true false');
+
+  // Keywords
+  define('keyword', 'if then do else elif while until for in esac fi fin ' +
+    'fil done exit set unset export function');
+
+  // Commands
+  define('builtin', 'ab awk bash beep cat cc cd chown chmod chroot clear cp ' +
+    'curl cut diff echo find gawk gcc get git grep kill killall ln ls make ' +
+    'mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh ' +
+    'shopt shred source sort sleep ssh start stop su sudo tee telnet top ' +
+    'touch vi vim wall wc wget who write yes zsh');
 
   function tokenBase(stream, state) {
 
@@ -42,10 +60,7 @@ CodeMirror.defineMode('shell', function(config) {
     stream.eatWhile(/\w/);
     var cur = stream.current();
     if (stream.peek() === '=' && /\w+/.test(cur)) return 'def';
-    if (atoms.indexOf(cur) !== -1) return 'atom';
-    if (commands.indexOf(cur) !== -1) return 'builtin';
-    if (keywords.indexOf(cur) !== -1) return 'keyword';
-    return 'word';
+    return words[cur] || null;
   }
 
   function tokenString(quote) {

data/vendor/assets/javascripts/codemirror/modes/stex.js

@@ -85,10 +85,12 @@ CodeMirror.defineMode("stex", function(cmCfg, modeCfg)
 	if (source.match(/^\\[a-zA-Z@]+/)) {
 	    var cmdName = source.current();
 	    cmdName = cmdName.substr(1, cmdName.length-1);
-	    var plug = plugins[cmdName];
-	    if (typeof(plug) == 'undefined') {
-		plug = plugins["DEFAULT"];
-	    }
+            var plug;
+            if (plugins.hasOwnProperty(cmdName)) {
+	      plug = plugins[cmdName];
+            } else {
+              plug = plugins["DEFAULT"];
+            }
 	    plug = new plug();
 	    pushCommand(state, plug);
 	    setState(state, beginParams);
@@ -176,5 +178,5 @@ CodeMirror.defineMode("stex", function(cmCfg, modeCfg)
  };
 });
 
-
 CodeMirror.defineMIME("text/x-stex", "stex");
+CodeMirror.defineMIME("text/x-latex", "stex");

data/vendor/assets/javascripts/codemirror/modes/tiddlywiki.js

@@ -107,10 +107,10 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 				return ret('quote', 'quote');
 			}
 			if (stream.match(reWikiCommentStart) || stream.match(reWikiCommentStop)) {
-				return ret('code', 'code');
+				return ret('code', 'comment');
 			}
 			if (stream.match(reJsCodeStart) || stream.match(reJsCodeStop) || stream.match(reXmlCodeStart) || stream.match(reXmlCodeStop)) {
-				return ret('code', 'code');
+				return ret('code', 'comment');
 			}
 			if (stream.match(reHR)) {
 				return ret('hr', 'hr');
@@ -125,26 +125,26 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 			}
 			if (ch == "*") { // tw list
 				stream.eatWhile('*');
-				return ret("list", "list");
+				return ret("list", "comment");
 			}
 			if (ch == "#") { // tw numbered list
 				stream.eatWhile('#');
-				return ret("list", "list");
+				return ret("list", "comment");
 			}
 			if (ch == ";") { // definition list, term
 				stream.eatWhile(';');
-				return ret("list", "list");
+				return ret("list", "comment");
 			}
 			if (ch == ":") { // definition list, description
 				stream.eatWhile(':');
-				return ret("list", "list");
+				return ret("list", "comment");
 			}
 			if (ch == ">") { // single line quote
 				stream.eatWhile(">");
 				return ret("quote", "quote");
 			}
 			if (ch == '|') {
-				return ret('table', 'table');
+				return ret('table', 'header');
 			}
 		}
 
@@ -155,7 +155,7 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 		// rudimentary html:// file:// link matching. TW knows much more ...
 		if (/[hf]/i.test(ch)) {
 			if (/[ti]/i.test(stream.peek()) && stream.match(/\b(ttps?|tp|ile):\/\/[\-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i)) {
-				return ret("link-external", "link-external");
+				return ret("link", "link");
 			}
 		}
 		// just a little string indicator, don't want to have the whole string covered
@@ -173,7 +173,7 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 		}
 		if (ch == "@") {	// check for space link. TODO fix @@...@@ highlighting
 			stream.eatWhile(isSpaceName);
-			return ret("link-external", "link-external");
+			return ret("link", "link");
 		}
 		if (/\d/.test(ch)) {	// numbers
 			stream.eatWhile(/\d/);
@@ -266,21 +266,21 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 		var ch, sb = state.block;
 		
 		if (sb && stream.current()) {
-			return ret("code", "code");
+			return ret("code", "comment");
 		}
 
 		if (!sb && stream.match(reUntilCodeStop)) {
 			state.tokenize = jsTokenBase;
-			return ret("code", "code-inline");
+			return ret("code", "comment");
 		}
 
 		if (sb && stream.sol() && stream.match(reCodeBlockStop)) {
 			state.tokenize = jsTokenBase;
-			return ret("code", "code");
+			return ret("code", "comment");
 		}
 
 		ch = stream.next();
-		return (sb) ? ret("code", "code") : ret("code", "code-inline");
+		return (sb) ? ret("code", "comment") : ret("code", "comment");
 	}
 
 	// tw em / italic
@@ -324,7 +324,7 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 			}
 			maybeEnd = (ch == "-");
 		}
-		return ret("text", "line-through");
+		return ret("text", "strikethrough");
 	}
 
 	// macro