codemirror-rails 3.15 → 3.16

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

@@ -78,18 +78,19 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     type = tp; content = cont;
     return style;
   }
-
   function jsTokenBase(stream, state) {
     var ch = stream.next();
     if (ch == '"' || ch == "'")
       return chain(stream, state, jsTokenString(ch));
+    else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/))
+      return ret("number", "number");
     else if (/[\[\]{}\(\),;\:\.]/.test(ch))
       return ret(ch);
     else if (ch == "0" && stream.eat(/x/i)) {
       stream.eatWhile(/[\da-f]/i);
       return ret("number", "number");
     }
-    else if (/\d/.test(ch) || ch == "-" && stream.eat(/\d/)) {
+    else if (/\d/.test(ch)) {
       stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
       return ret("number", "number");
     }

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

@@ -151,6 +151,9 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
         }
 
         if (stream.match(identifiers)) {
+            if (state.lastToken == 'def' || state.lastToken == 'class') {
+                return 'def';
+            }
             return 'variable';
         }
 
@@ -258,7 +261,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
         // Handle '.' connected identifiers
         if (current === '.') {
             style = stream.match(identifiers, false) ? null : ERRORCLASS;
-            if (style === null && state.lastToken === 'meta') {
+            if (style === null && state.lastStyle === 'meta') {
                 // Apply 'meta' style to '.' connected identifiers when
                 // appropriate.
                 style = 'meta';
@@ -272,7 +275,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
         }
 
         if ((style === 'variable' || style === 'builtin')
-            && state.lastToken === 'meta') {
+            && state.lastStyle === 'meta') {
             style = 'meta';
         }
 
@@ -313,6 +316,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
             return {
               tokenize: tokenBase,
               scopes: [{offset:basecolumn || 0, type:'py'}],
+              lastStyle: null,
               lastToken: null,
               lambda: false,
               dedent: 0
@@ -322,12 +326,16 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
         token: function(stream, state) {
             var style = tokenLexer(stream, state);
 
-            state.lastToken = style;
+            state.lastStyle = style;
+
+            var current = stream.current();
+            if (current && style) {
+                state.lastToken = current;
+            }
 
             if (stream.eol() && state.lambda) {
                 state.lambda = false;
             }
-
             return style;
         },
 

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

@@ -124,9 +124,7 @@ CodeMirror.defineMode('rst-base', function (config) {
                     token = 'keyword';
 
                     if (stream.current().match(/^(?:math|latex)/)) {
-                        state.tmp = {
-                            mode: mode_stex, local: mode_stex.startState()
-                        };
+                        state.tmp_stex = true;
                     }
                     break;
                 case 2:
@@ -135,6 +133,12 @@ CodeMirror.defineMode('rst-base', function (config) {
                     token = 'meta';
                     break;
                 case 3:
+                    if (state.tmp_stex) {
+                        state.tmp_stex = undefined; state.tmp = {
+                            mode: mode_stex, local: mode_stex.startState()
+                        };
+                    }
+
                     if (state.tmp) {
                         if (stream.peek() == '`') {
                             change(state, to_normal, context(rx_role_pre, 4));
@@ -345,24 +349,24 @@ CodeMirror.defineMode('rst-base', function (config) {
                     change(state, to_explicit, context(rx_directive, 2));
                     assert(stream.match(rx_directive_tail));
                     token = 'meta';
-                    break;
-                default:
+
                     if (stream.match(/^latex\s*$/) || state.tmp_stex) {
-                        state.tmp_stex = undefined;
-                        change(state, to_mode, {
+                        state.tmp_stex = undefined; change(state, to_mode, {
                             mode: mode_stex, local: mode_stex.startState()
                         });
-                    } else if (stream.match(/^python\s*$/) || state.tmp_py) {
-                        state.tmp_py = undefined;
-                        change(state, to_mode, {
+                    }
+                    break;
+                case 2:
+                    change(state, to_explicit, context(rx_directive, 3));
+                    if (stream.match(/^python\s*$/) || state.tmp_py) {
+                        state.tmp_py = undefined; change(state, to_mode, {
                             mode: mode_python, local: mode_python.startState()
                         });
                     }
-
-                    else {
-                        change(state, to_normal);
-                        assert(stream.current() == '');
-                    }
+                    break;
+                default:
+                    change(state, to_normal);
+                    assert(stream.current() == '');
             }
         } else if (phase(state) == rx_link || stream.match(rx_link, false)) {
 
@@ -437,12 +441,7 @@ CodeMirror.defineMode('rst-base', function (config) {
                 return null;
             }
 
-            try {
-                return state.ctx.mode.token(stream, state.ctx.local);
-            } catch (ex) {
-                change(state, to_normal);
-                return null;
-            }
+            return state.ctx.mode.token(stream, state.ctx.local);
         }
 
         change(state, to_normal);

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

@@ -9,7 +9,7 @@ CodeMirror.defineMode("velocity", function() {
                               "#{end} #{else} #{break} #{stop}");
     var functions = parseWords("#if #elseif #foreach #set #include #parse #macro #define #evaluate " +
                                "#{if} #{elseif} #{foreach} #{set} #{include} #{parse} #{macro} #{define} #{evaluate}");
-    var specials = parseWords("$foreach.count $foreach.hasNext $foreach.first $foreach.last $foreach.topmost $foreach.parent $velocityCount");
+    var specials = parseWords("$foreach.count $foreach.hasNext $foreach.first $foreach.last $foreach.topmost $foreach.parent.count $foreach.parent.hasNext $foreach.parent.first $foreach.parent.last $foreach.parent $velocityCount $!bodyContent $bodyContent");
     var isOperatorChar = /[+\-*&%=<>!?:\/|]/;
 
     function chain(stream, state, f) {
@@ -20,30 +20,50 @@ CodeMirror.defineMode("velocity", function() {
         var beforeParams = state.beforeParams;
         state.beforeParams = false;
         var ch = stream.next();
-        // start of string?
-        if ((ch == '"' || ch == "'") && state.inParams)
+        // start of unparsed string?
+        if ((ch == "'") && state.inParams) {
+            state.lastTokenWasBuiltin = false;
             return chain(stream, state, tokenString(ch));
+        }
+        // start of parsed string?
+        else if ((ch == '"')) {
+            state.lastTokenWasBuiltin = false;
+            if (state.inString) {
+                state.inString = false;
+                return "string";
+            }
+            else if (state.inParams)
+                return chain(stream, state, tokenString(ch));
+        }
         // is it one of the special signs []{}().,;? Seperator?
         else if (/[\[\]{}\(\),;\.]/.test(ch)) {
-            if (ch == "(" && beforeParams) state.inParams = true;
-            else if (ch == ")") state.inParams = false;
+            if (ch == "(" && beforeParams)
+                state.inParams = true;
+            else if (ch == ")") {
+                state.inParams = false;
+                state.lastTokenWasBuiltin = true;
+            }
             return null;
         }
         // start of a number value?
         else if (/\d/.test(ch)) {
+            state.lastTokenWasBuiltin = false;
             stream.eatWhile(/[\w\.]/);
             return "number";
         }
         // multi line comment?
         else if (ch == "#" && stream.eat("*")) {
+            state.lastTokenWasBuiltin = false;
             return chain(stream, state, tokenComment);
         }
         // unparsed content?
         else if (ch == "#" && stream.match(/ *\[ *\[/)) {
+            state.lastTokenWasBuiltin = false;
             return chain(stream, state, tokenUnparsed);
         }
         // single line comment?
         else if (ch == "#" && stream.eat("#")) {
+            state.lastTokenWasBuiltin = false;
             stream.skipToEnd();
             return "comment";
         }
@@ -51,33 +71,44 @@ CodeMirror.defineMode("velocity", function() {
         else if (ch == "$") {
             stream.eatWhile(/[\w\d\$_\.{}]/);
             // is it one of the specials?
-            if (specials && specials.propertyIsEnumerable(stream.current().toLowerCase())) {
+            if (specials && specials.propertyIsEnumerable(stream.current())) {
                 return "keyword";
             }
             else {
+                state.lastTokenWasBuiltin = true;
                 state.beforeParams = true;
                 return "builtin";
             }
         }
         // is it a operator?
         else if (isOperatorChar.test(ch)) {
+            state.lastTokenWasBuiltin = false;
             stream.eatWhile(isOperatorChar);
             return "operator";
         }
         else {
             // get the whole word
-            stream.eatWhile(/[\w\$_{}]/);
-            var word = stream.current().toLowerCase();
+            stream.eatWhile(/[\w\$_{}@]/);
+            var word = stream.current();
             // is it one of the listed keywords?
             if (keywords && keywords.propertyIsEnumerable(word))
                 return "keyword";
             // is it one of the listed functions?
             if (functions && functions.propertyIsEnumerable(word) ||
-                stream.current().match(/^#[a-z0-9_]+ *$/i) && stream.peek()=="(") {
+                    (stream.current().match(/^#@?[a-z0-9_]+ *$/i) && stream.peek()=="(") &&
+                     !(functions && functions.propertyIsEnumerable(word.toLowerCase()))) {
                 state.beforeParams = true;
+                state.lastTokenWasBuiltin = false;
                 return "keyword";
             }
+            if (state.inString) {
+                state.lastTokenWasBuiltin = false;
+                return "string";
+            }
+            if (stream.pos > word.length && stream.string.charAt(stream.pos-word.length-1)=="." && state.lastTokenWasBuiltin)
+                return "builtin";
             // default: just a "word"
+            state.lastTokenWasBuiltin = false;
             return null;
         }
     }
@@ -86,7 +117,12 @@ CodeMirror.defineMode("velocity", function() {
         return function(stream, state) {
             var escaped = false, next, end = false;
             while ((next = stream.next()) != null) {
-                if (next == quote && !escaped) {
+                if ((next == quote) && !escaped) {
+                    end = true;
+                    break;
+                }
+                if (quote=='"' && stream.peek() == '$' && !escaped) {
+                    state.inString = true;
                     end = true;
                     break;
                 }
@@ -130,14 +166,20 @@ CodeMirror.defineMode("velocity", function() {
             return {
                 tokenize: tokenBase,
                 beforeParams: false,
-                inParams: false
+                inParams: false,
+                inString: false,
+                lastTokenWasBuiltin: false
             };
         },
 
         token: function(stream, state) {
             if (stream.eatSpace()) return null;
             return state.tokenize(stream, state);
-        }
+        },
+        blockCommentStart: "#*",
+        blockCommentEnd: "*#",
+        lineComment: "##",
+        fold: "velocity"
     };
 });
 

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

@@ -261,7 +261,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
   function attribute(type) {
     if (type == "equals") return cont(attvalue, attributes);
     if (!Kludges.allowMissing) setStyle = "error";
-    else if (type == "word") setStyle = "attribute";
+    else if (type == "word") {setStyle = "attribute"; return cont(attribute, attributes);}
     return (type == "endTag" || type == "selfcloseTag") ? pass() : cont();
   }
   function attvalue(type) {

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

@@ -442,7 +442,11 @@ CodeMirror.defineMode("xquery", function() {
       if (stream.eatSpace()) return null;
       var style = state.tokenize(stream, state);
       return style;
-    }
+    },
+
+    blockCommentStart: "(:",
+    blockCommentEnd: ":)"
+
   };
 
 });

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

@@ -26,14 +26,6 @@ CodeMirror.defineMode("yaml", function() {
         /* array list item */
         if (stream.match(/\s*-\s+/)) { return 'meta'; }
       }
-      /* pairs (associative arrays) -> key */
-      if (!state.pair && stream.match(/^\s*([a-z0-9\._-])+(?=\s*:)/i)) {
-        state.pair = true;
-        state.keyCol = stream.indentation();
-        return "atom";
-      }
-      if (state.pair && stream.match(/^:\s*/)) { state.pairStart = true; return 'meta'; }
-
       /* inline pairs/lists */
       if (stream.match(/^(\{|\}|\[|\])/)) {
         if (ch == '{')
@@ -74,6 +66,14 @@ CodeMirror.defineMode("yaml", function() {
         if (stream.match(keywordRegex)) { return 'keyword'; }
       }
 
+      /* pairs (associative arrays) -> key */
+      if (!state.pair && stream.match(/^\s*\S+(?=\s*:($|\s))/i)) {
+        state.pair = true;
+        state.keyCol = stream.indentation();
+        return "atom";
+      }
+      if (state.pair && stream.match(/^:\s*/)) { state.pairStart = true; return 'meta'; }
+
       /* nothing found, continue */
       state.pairStart = false;
       state.escaped = (ch == '\\');

data/vendor/assets/stylesheets/codemirror.css

@@ -95,6 +95,7 @@
 
 div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
 div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
+.CodeMirror-activeline-background {background: #e8f2ff;}
 
 /* STOP */
 

data/vendor/assets/stylesheets/codemirror/addons/display/fullscreen.css

@@ -0,0 +1,6 @@
+.CodeMirror-fullscreen {
+  position: fixed;
+  top: 0; left: 0; right: 0; bottom: 0;
+  height: auto;
+  z-index: 9999;
+}

data/vendor/assets/stylesheets/codemirror/themes/3024-day.css

@@ -30,4 +30,5 @@
 .cm-s-3024-day span.cm-tag {color: #db2d20;}
 .cm-s-3024-day span.cm-link {color: #a16a94;}
 
+.cm-s-3024-day .CodeMirror-activeline-background {background: #e8f2ff !important;}
 .cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

data/vendor/assets/stylesheets/codemirror/themes/3024-night.css

@@ -30,4 +30,5 @@
 .cm-s-3024-night span.cm-tag {color: #db2d20;}
 .cm-s-3024-night span.cm-link {color: #a16a94;}
 
+.cm-s-3024-night .CodeMirror-activeline-background {background: #2F2F2F !important;}
 .cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

data/vendor/assets/stylesheets/codemirror/themes/ambiance.css

@@ -65,7 +65,7 @@
   border-left: 1px solid #7991E8;
 }
 
-.cm-s-ambiance .activeline {
+.cm-s-ambiance .CodeMirror-activeline-background {
   background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
 }
 

data/vendor/assets/stylesheets/codemirror/themes/base16-dark.css

@@ -30,4 +30,5 @@
 .cm-s-base16-dark span.cm-tag {color: #ac4142;}
 .cm-s-base16-dark span.cm-link {color: #aa759f;}
 
+.cm-s-base16-dark .CodeMirror-activeline-background {background: #2F2F2F !important;}
 .cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

data/vendor/assets/stylesheets/codemirror/themes/base16-light.css

@@ -30,4 +30,5 @@
 .cm-s-base16-light span.cm-tag {color: #ac4142;}
 .cm-s-base16-light span.cm-link {color: #aa759f;}
 
+.cm-s-base16-light .CodeMirror-activeline-background {background: #DDDCDC !important;}
 .cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}

data/vendor/assets/stylesheets/codemirror/themes/blackboard.css

@@ -23,3 +23,6 @@
 .cm-s-blackboard .cm-header { color: #FF6400; }
 .cm-s-blackboard .cm-hr { color: #AEAEAE; }
 .cm-s-blackboard .cm-link { color: #8DA6CE; }
+
+.cm-s-blackboard .CodeMirror-activeline-background {background: #3C3636 !important;}
+.cm-s-blackboard .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}

data/vendor/assets/stylesheets/codemirror/themes/cobalt.css

@@ -16,3 +16,6 @@
 .cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
 .cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
 .cm-s-cobalt span.cm-link { color: #845dc4; }
+
+.cm-s-cobalt .CodeMirror-activeline-background {background: #002D57 !important;}
+.cm-s-cobalt .CodeMirror-matchingbracket {outline:1px solid grey;color:white !important}

data/vendor/assets/stylesheets/codemirror/themes/eclipse.css

@@ -19,7 +19,5 @@
 .cm-s-eclipse span.cm-attribute {color: #00c;}
 .cm-s-eclipse span.cm-link {color: #219;}
 
-.cm-s-eclipse .CodeMirror-matchingbracket {
-	outline:1px solid grey;
-	color:black !important;
-}
+.cm-s-eclipse .CodeMirror-activeline-background {background: #e8f2ff !important;}
+.cm-s-eclipse .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}

data/vendor/assets/stylesheets/codemirror/themes/elegant.css

@@ -8,3 +8,6 @@
 .cm-s-elegant span.cm-builtin {color: #30a;}
 .cm-s-elegant span.cm-error {background-color: #fdd;}
 .cm-s-elegant span.cm-link {color: #762;}
+
+.cm-s-elegant .CodeMirror-activeline-background {background: #e8f2ff !important;}
+.cm-s-elegant .CodeMirror-matchingbracket {outline:1px solid grey; color:black !important;}

data/vendor/assets/stylesheets/codemirror/themes/erlang-dark.css

@@ -4,7 +4,7 @@
 .cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
 .cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
 
-.cm-s-erlang-dark span.cm-atom       { color: #845dc4; }
+.cm-s-erlang-dark span.cm-atom       { color: #f133f1; }
 .cm-s-erlang-dark span.cm-attribute  { color: #ff80e1; }
 .cm-s-erlang-dark span.cm-bracket    { color: #ff9d00; }
 .cm-s-erlang-dark span.cm-builtin    { color: #eaa; }
@@ -14,8 +14,17 @@
 .cm-s-erlang-dark span.cm-keyword    { color: #ffee80; }
 .cm-s-erlang-dark span.cm-meta       { color: #50fefe; }
 .cm-s-erlang-dark span.cm-number     { color: #ffd0d0; }
-.cm-s-erlang-dark span.cm-operator   { color: #d11; }
+.cm-s-erlang-dark span.cm-operator   { color: #d55; }
+.cm-s-erlang-dark span.cm-property   { color: #ccc; }
+.cm-s-erlang-dark span.cm-qualifier  { color: #ccc; }
+.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
+.cm-s-erlang-dark span.cm-special    { color: #ffbbbb; }
 .cm-s-erlang-dark span.cm-string     { color: #3ad900; }
+.cm-s-erlang-dark span.cm-string-2   { color: #ccc; }
 .cm-s-erlang-dark span.cm-tag        { color: #9effff; }
 .cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
 .cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
+.cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
+
+.cm-s-erlang-dark .CodeMirror-activeline-background {background: #013461 !important;}
+.cm-s-erlang-dark .CodeMirror-matchingbracket {outline:1px solid grey; color:white !important;}