codemirror-rails 3.12 → 3.13

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

@@ -456,8 +456,9 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
 
     indent:
       function(state, textAfter) {
-//        console.log(state.tokenStack);
         return myIndent(state,textAfter);
-      }
+      },
+
+    lineComment: "%"
   };
 });

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

@@ -321,6 +321,10 @@ CodeMirror.defineMode("gas", function(_config, parserConfig) {
           return style;
         }
       }
-    }
+    },
+
+    lineComment: lineCommentStartSymbol,
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/"
   };
 });

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

@@ -158,7 +158,10 @@ CodeMirror.defineMode("go", function(config) {
       else return ctx.indented + (closing ? 0 : indentUnit);
     },
 
-    electricChars: "{}:"
+    electricChars: "{}:",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
   };
 });
 

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

@@ -0,0 +1,153 @@
+(function() {
+  "use strict";
+
+  // full haml mode. This handled embeded ruby and html fragments too
+  CodeMirror.defineMode("haml", function(config) {
+    var htmlMode = CodeMirror.getMode(config, {name: "htmlmixed"});
+    var rubyMode = CodeMirror.getMode(config, "ruby");
+
+    function rubyInQuote(endQuote) {
+      return function(stream, state) {
+        var ch = stream.peek();
+        if (ch == endQuote && state.rubyState.tokenize.length == 1) {
+          // step out of ruby context as it seems to complete processing all the braces
+          stream.next();
+          state.tokenize = html;
+          return "closeAttributeTag";
+        } else {
+          return ruby(stream, state);
+        }
+      };
+    }
+
+    function ruby(stream, state) {
+      if (stream.match("-#")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+      return rubyMode.token(stream, state.rubyState);
+    }
+
+    function html(stream, state) {
+      var ch = stream.peek();
+
+      // handle haml declarations. All declarations that cant be handled here
+      // will be passed to html mode
+      if (state.previousToken.style == "comment" ) {
+        if (state.indented > state.previousToken.indented) {
+          stream.skipToEnd();
+          return "commentLine";
+        }
+      }
+
+      if (state.startOfLine) {
+        if (ch == "!" && stream.match("!!")) {
+          stream.skipToEnd();
+          return "tag";
+        } else if (stream.match(/^%[\w:#\.]+=/)) {
+          state.tokenize = ruby;
+          return "hamlTag";
+        } else if (stream.match(/^%[\w:]+/)) {
+          return "hamlTag";
+        } else if (ch == "/" ) {
+          stream.skipToEnd();
+          return "comment";
+        }
+      }
+
+      if (state.startOfLine || state.previousToken.style == "hamlTag") {
+        if ( ch == "#" || ch == ".") {
+          stream.match(/[\w-#\.]*/);
+          return "hamlAttribute";
+        }
+      }
+
+      // donot handle --> as valid ruby, make it HTML close comment instead
+      if (state.startOfLine && !stream.match("-->", false) && (ch == "=" || ch == "-" )) {
+        state.tokenize = ruby;
+        return null;
+      }
+
+      if (state.previousToken.style == "hamlTag" ||
+          state.previousToken.style == "closeAttributeTag" ||
+          state.previousToken.style == "hamlAttribute") {
+        if (ch == "(") {
+          state.tokenize = rubyInQuote(")");
+          return null;
+        } else if (ch == "{") {
+          state.tokenize = rubyInQuote("}");
+          return null;
+        }
+      }
+
+      return htmlMode.token(stream, state.htmlState);
+    }
+
+    return {
+      // default to html mode
+      startState: function() {
+        var htmlState = htmlMode.startState();
+        var rubyState = rubyMode.startState();
+        return {
+          htmlState: htmlState,
+          rubyState: rubyState,
+          indented: 0,
+          previousToken: { style: null, indented: 0},
+          tokenize: html
+        };
+      },
+
+      copyState: function(state) {
+        return {
+          htmlState : CodeMirror.copyState(htmlMode, state.htmlState),
+          rubyState: CodeMirror.copyState(rubyMode, state.rubyState),
+          indented: state.indented,
+          previousToken: state.previousToken,
+          tokenize: state.tokenize
+        };
+      },
+
+      token: function(stream, state) {
+        if (stream.sol()) {
+          state.indented = stream.indentation();
+          state.startOfLine = true;
+        }
+        if (stream.eatSpace()) return null;
+        var style = state.tokenize(stream, state);
+        state.startOfLine = false;
+        // dont record comment line as we only want to measure comment line with
+        // the opening comment block
+        if (style && style != "commentLine") {
+          state.previousToken = { style: style, indented: state.indented };
+        }
+        // if current state is ruby and the previous token is not `,` reset the
+        // tokenize to html
+        if (stream.eol() && state.tokenize == ruby) {
+          stream.backUp(1);
+          var ch = stream.peek();
+          stream.next();
+          if (ch && ch != ",") {
+            state.tokenize = html;
+          }
+        }
+        // reprocess some of the specific style tag when finish setting previousToken
+        if (style == "hamlTag") {
+          style = "tag";
+        } else if (style == "commentLine") {
+          style = "comment";
+        } else if (style == "hamlAttribute") {
+          style = "attribute";
+        } else if (style == "closeAttributeTag") {
+          style = null;
+        }
+        return style;
+      },
+
+      indent: function(state) {
+        return state.indented;
+      }
+    };
+  }, "htmlmixed", "ruby");
+
+  CodeMirror.defineMIME("text/x-haml", "haml");
+})();

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

@@ -234,7 +234,11 @@ CodeMirror.defineMode("haskell", function() {
       var t = state.f(stream, function(s) { state.f = s; });
       var w = stream.current();
       return (w in wellKnownWords) ? wellKnownWords[w] : t;
-    }
+    },
+
+    blockCommentStart: "{-",
+    blockCommentEnd: "-}",
+    lineComment: "--"
   };
 
 });

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

@@ -291,7 +291,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
 
   function maybeoperatorComma(type, value) {
-    if (type == ",") return cont(expression);
+    if (type == ",") return pass();
     return maybeoperatorNoComma(type, value, maybeoperatorComma);
   }
   function maybeoperatorNoComma(type, value, me) {
@@ -453,6 +453,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     },
 
     electricChars: ":{}",
+    blockCommentStart: jsonMode ? null : "/*",
+    blockCommentEnd: jsonMode ? null : "*/",
+    lineComment: jsonMode ? null : "//",
 
     jsonMode: jsonMode
   };
@@ -463,5 +466,6 @@ CodeMirror.defineMIME("text/ecmascript", "javascript");
 CodeMirror.defineMIME("application/javascript", "javascript");
 CodeMirror.defineMIME("application/ecmascript", "javascript");
 CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
+CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});
 CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });
 CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });

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

@@ -7,12 +7,6 @@
 CodeMirror.defineMode("less", function(config) {
   var indentUnit = config.indentUnit, type;
   function ret(style, tp) {type = tp; return style;}
-  //html tags
-  var tags = "a abbr acronym address applet area article aside audio b base basefont bdi bdo big blockquote body br button canvas caption cite code col colgroup command datalist dd del details dfn dir div dl dt em embed fieldset figcaption figure font footer form frame frameset h1 h2 h3 h4 h5 h6 head header hgroup hr html i iframe img input ins keygen kbd label legend li link map mark menu meta meter nav noframes noscript object ol optgroup option output p param pre progress q rp rt ruby s samp script section select small source span strike strong style sub summary sup table tbody td textarea tfoot th thead time title tr track tt u ul var video wbr".split(' ');
-
-  function inTagsArray(val){
-    for(var i=0; i<tags.length; i++)if(val === tags[i])return true;
-  }
 
   var selectors = /(^\:root$|^\:nth\-child$|^\:nth\-last\-child$|^\:nth\-of\-type$|^\:nth\-last\-of\-type$|^\:first\-child$|^\:last\-child$|^\:first\-of\-type$|^\:last\-of\-type$|^\:only\-child$|^\:only\-of\-type$|^\:empty$|^\:link|^\:visited$|^\:active$|^\:hover$|^\:focus$|^\:target$|^\:lang$|^\:enabled^\:disabled$|^\:checked$|^\:first\-line$|^\:first\-letter$|^\:before$|^\:after$|^\:not$|^\:required$|^\:invalid$)/;
 
@@ -135,8 +129,6 @@ CodeMirror.defineMode("less", function(config) {
         //stream.backUp(stream.current().length-1);
         //return ret(null, ch); //console.log( stream.current() );
         return ret("number", "unit");
-      }else if( inTagsArray(stream.current().toLowerCase()) ){ // match html tags
-        return ret("tag", "tag");
       }else if( /\/|[\s\)]/.test(stream.peek() || stream.eol() || (stream.eatSpace() && stream.peek() == "/")) && stream.current().indexOf(".") !== -1){
         if(stream.current().substring(stream.current().length-1,stream.current().length) == "{"){
           stream.backUp(1);

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

@@ -133,7 +133,11 @@ CodeMirror.defineMode("lua", function(config, parserConfig) {
     indent: function(state, textAfter) {
       var closing = dedentPartial.test(textAfter);
       return state.basecol + indentUnit * (state.indentDepth - (closing ? 1 : 0));
-    }
+    },
+
+    lineComment: "--",
+    blockCommentStart: "--[[",
+    blockCommentEnd: "]]"
   };
 });
 

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

@@ -1,7 +1,7 @@
 CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
-  var htmlFound = CodeMirror.mimeModes.hasOwnProperty("text/html");
-  var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? "text/html" : "text/plain");
+  var htmlFound = CodeMirror.modes.hasOwnProperty("xml");
+  var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? {name: "xml", htmlMode: true} : "text/plain");
   var aliases = {
     html: "htmlmixed",
     js: "javascript",

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

@@ -106,7 +106,10 @@ CodeMirror.defineMode('ocaml', function() {
     token: function(stream, state) {
       if (stream.eatSpace()) return null;
       return state.tokenize(stream, state);
-    }
+    },
+
+    blockCommentStart: "(*",
+    blockCommentEnd: "*)"
   };
 });
 

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

@@ -118,6 +118,9 @@
       },
 
       electricChars: "/{}:",
+      blockCommentStart: "/*",
+      blockCommentEnd: "*/",
+      lineComment: "//",
 
       innerMode: function(state) { return {state: state.curState, mode: state.curMode}; }
     };

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

@@ -331,8 +331,9 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
             }
 
             return state.scopes[0].offset;
-        }
+        },
 
+        lineComment: "#"
     };
     return external;
 });

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

@@ -186,8 +186,9 @@ CodeMirror.defineMode("ruby", function(config) {
       return ct.indented + (closing ? 0 : config.indentUnit) +
         (state.continuedLine ? config.indentUnit : 0);
     },
-     electricChars: "}de" // enD and rescuE
 
+    electricChars: "}de", // enD and rescuE
+    lineComment: "#"
   };
 });
 

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

@@ -425,7 +425,10 @@ CodeMirror.defineMode("rust", function() {
       return lexical.indented + (closing ? 0 : (lexical.info == "alt" ? altIndentUnit : indentUnit));
     },
 
-    electricChars: "{}"
+    electricChars: "{}",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
   };
 });
 

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

@@ -3,24 +3,13 @@ CodeMirror.defineMode("sass", function(config) {
     return new RegExp("^" + words.join("|"));
   };
 
-  var tags = ["&", "a","abbr","acronym","address","applet","area","article","aside","audio","b","base","basefont","bdi","bdo","big","blockquote","body","br","button","canvas","caption","cite","code","col","colgroup","command","datalist","dd","del","details","dfn","dir","div","dl","dt","em","embed","fieldset","figcaption","figure","font","footer","form","frame","frameset","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe","img","input","ins","keygen","kbd","label","legend","li","link","map","mark","menu","meta","meter","nav","noframes","noscript","object","ol","optgroup","option","output","p","param","pre","progress","q","rp","rt","ruby","s","samp","script","section","select","small","source","span","strike","strong","style","sub","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","title","tr","track","tt","u","ul","var","video","wbr"];
   var keywords = ["true", "false", "null", "auto"];
   var keywordsRegexp = new RegExp("^" + keywords.join("|"));
 
   var operators = ["\\(", "\\)", "=", ">", "<", "==", ">=", "<=", "\\+", "-", "\\!=", "/", "\\*", "%", "and", "or", "not"];
   var opRegexp = tokenRegexp(operators);
 
-  function htmlTag(val){
-    for(var i=0; i<tags.length; i++){
-      if(val === tags[i]){
-        return true;
-      }
-    }
-  }
-
-
-  var pseudoElements = [':first-line', ':hover', ':first-letter', ':active', ':visited', ':before', ':after', ':link', ':focus', ':first-child', ':lang'];
-  var pseudoElementsRegexp = new RegExp("^(" + pseudoElements.join("\\b|") + ")");
+  var pseudoElementsRegexp = /^::?[\w\-]+/;
 
   var urlTokens = function(stream, state){
     var ch = stream.peek();
@@ -256,25 +245,17 @@ CodeMirror.defineMode("sass", function(config) {
     }
 
     // Pseudo element selectors
-    if (stream.match(pseudoElementsRegexp)){
+    if (ch == ':' && stream.match(pseudoElementsRegexp)){
       return "keyword";
     }
 
     // atoms
     if (stream.eatWhile(/[\w-&]/)){
-
-      var current = stream.current();
       // matches a property definition
-      if (stream.peek() === ":"){
-        // if this is an html tag and it has a pseudo selector, then it's an atom
-        if (htmlTag(current) && stream.match(pseudoElementsRegexp, false)){
-          return "atom";
-        }else{
-          stream.next();
-          return "property";
-        }
-      }
-      return "atom";
+      if (stream.peek() === ":" && !stream.match(pseudoElementsRegexp, false))
+        return "property";
+      else
+        return "atom";
     }
 
     if (stream.match(opRegexp)){
@@ -298,7 +279,7 @@ CodeMirror.defineMode("sass", function(config) {
       dedent(state);
     }
 
-    if (style === "atom" && htmlTag(current)){
+    if (style === "atom"){
       indent(state);
     }
 
@@ -312,7 +293,7 @@ CodeMirror.defineMode("sass", function(config) {
         var scope = state.scopes[i];
 
         if (scope.offset <= withCurrentIndent){
-      newScopes.push(scope);
+          newScopes.push(scope);
         }
       }
 

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

@@ -223,7 +223,9 @@ CodeMirror.defineMode("scheme", function () {
         indent: function (state) {
             if (state.indentStack == null) return state.indentation;
             return state.indentStack.indent;
-        }
+        },
+
+        lineComment: ";;"
     };
 });
 

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

@@ -1,6 +1,6 @@
 CodeMirror.defineMode('smalltalk', function(config) {
 
-  var specialChars = /[+\-\/\\*~<>=@%|&?!.:;^]/;
+  var specialChars = /[+\-\/\\*~<>=@%|&?!.,:;^]/;
   var keywords = /true|false|nil|self|super|thisContext/;
 
   var Context = function(tokenizer, parent) {
@@ -36,11 +36,14 @@ CodeMirror.defineMode('smalltalk', function(config) {
       token = nextString(stream, new Context(nextString, context));
 
     } else if (aChar === '#') {
-      stream.eatWhile(/[^ .]/);
+      stream.eatWhile(/[^ .\[\]()]/);
       token.name = 'string-2';
 
     } else if (aChar === '$') {
-      stream.eatWhile(/[^ ]/);
+      if (stream.next() === '<') {
+        stream.eatWhile(/[^ >]/);
+        stream.next();
+      }
       token.name = 'string-2';
 
     } else if (aChar === '|' && state.expectVariable) {
@@ -118,7 +121,6 @@ CodeMirror.defineMode('smalltalk', function(config) {
       state.context = token.context;
       state.expectVariable = token.eos;
 
-      state.lastToken = token;
       return token.name;
     },