codemirror-rails 0.2.3 → 0.3.0

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

@@ -11,24 +11,28 @@ CodeMirror.defineMode('coffeescript', function(conf) {
     
     var singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!\?]");
     var singleDelimiters = new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]');
-    var doubleOperators = new RegExp("^((\\+\\+)|(\\+\\=)|(\\-\\-)|(\\-\\=)|(\\*\\*)|(\\*\\=)|(\\/\\/)|(\\/\\=)|(==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//))");
-    var doubleDelimiters = new RegExp("^((\->)|(\\.\\.)|(\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
+    var doubleOperators = new RegExp("^((\->)|(\=>)|(\\+\\+)|(\\+\\=)|(\\-\\-)|(\\-\\=)|(\\*\\*)|(\\*\\=)|(\\/\\/)|(\\/\\=)|(==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//))");
+    var doubleDelimiters = new RegExp("^((\\.\\.)|(\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
     var tripleDelimiters = new RegExp("^((\\.\\.\\.)|(//=)|(>>=)|(<<=)|(\\*\\*=))");
     var identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
 
     var wordOperators = wordRegexp(['and', 'or', 'not',
                                     'is', 'isnt', 'in',
                                     'instanceof', 'typeof']);
-    var commonKeywords = ['break', 'by', 'catch', 'class', 'continue',
-                          'debugger', 'delete', 'do', 'else', 'finally',
-                          'for', 'in', 'of', 'if', 'new', 'return',
-                          'switch', 'then', 'this', 'throw', 'try',
-                          'unless', 'when', 'while', 'until', 'loop'];
-    var keywords = wordRegexp(commonKeywords);
+    var indentKeywords = ['for', 'while', 'loop', 'if', 'unless', 'else',
+                          'switch', 'try', 'catch', 'finally', 'class'];
+    var commonKeywords = ['break', 'by', 'continue', 'debugger', 'delete',
+                          'do', 'in', 'of', 'new', 'return', 'then',
+                          'this', 'throw', 'when', 'until'];
 
+    var keywords = wordRegexp(indentKeywords.concat(commonKeywords));
 
-    var stringPrefixes = new RegExp("^(([rub]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
-    var commonConstants = ['Infinity', 'NaN', 'undefined', 'true', 'false'];
+    indentKeywords = wordRegexp(indentKeywords);
+
+
+    var stringPrefixes = new RegExp("^('{3}|\"{3}|['\"])");
+    var regexPrefixes = new RegExp("^(/{3}|/)");
+    var commonConstants = ['Infinity', 'NaN', 'undefined', 'null', 'true', 'false', 'on', 'off', 'yes', 'no'];
     var constants = wordRegexp(commonConstants);
 
     // Tokenizers
@@ -99,9 +103,18 @@ CodeMirror.defineMode('coffeescript', function(conf) {
         
         // Handle strings
         if (stream.match(stringPrefixes)) {
-            state.tokenize = tokenStringFactory(stream.current());
+            state.tokenize = tokenFactory(stream.current(), 'string');
             return state.tokenize(stream, state);
         }
+        // Handle regex literals
+        if (stream.match(regexPrefixes)) {
+            if (stream.current() != '/' || stream.match(/^.*\//, false)) { // prevent highlight of division
+                state.tokenize = tokenFactory(stream.current(), 'string-2');
+                return state.tokenize(stream, state);
+            } else {
+                stream.backUp(1);
+            }
+        }
         
         // Handle operators and delimiters
         if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) {
@@ -133,37 +146,33 @@ CodeMirror.defineMode('coffeescript', function(conf) {
         return ERRORCLASS;
     }
     
-    function tokenStringFactory(delimiter) {
-        while ('rub'.indexOf(delimiter[0].toLowerCase()) >= 0) {
-            delimiter = delimiter.substr(1);
-        }
+    function tokenFactory(delimiter, outclass) {
         var delim_re = new RegExp(delimiter);
         var singleline = delimiter.length == 1;
-        var OUTCLASS = 'string';
         
         return function tokenString(stream, state) {
             while (!stream.eol()) {
-                stream.eatWhile(/[^'"\\]/);
+                stream.eatWhile(/[^'"\/\\]/);
                 if (stream.eat('\\')) {
                     stream.next();
                     if (singleline && stream.eol()) {
-                        return OUTCLASS;
+                        return outclass;
                     }
                 } else if (stream.match(delim_re)) {
                     state.tokenize = tokenBase;
-                    return OUTCLASS;
+                    return outclass;
                 } else {
-                    stream.eat(/['"]/);
+                    stream.eat(/['"\/]/);
                 }
             }
             if (singleline) {
                 if (conf.mode.singleLineStringErrors) {
-                    OUTCLASS = ERRORCLASS
+                    outclass = ERRORCLASS
                 } else {
                     state.tokenize = tokenBase;
                 }
             }
-            return OUTCLASS;
+            return outclass;
         };
     }
     
@@ -225,7 +234,7 @@ CodeMirror.defineMode('coffeescript', function(conf) {
             }
         }
         
-        // Handle decorators
+        // Handle properties
         if (current === '@') {
             style = state.tokenize(stream, state);
             current = stream.current();
@@ -237,10 +246,10 @@ CodeMirror.defineMode('coffeescript', function(conf) {
         }
         
         // Handle scope changes.
-        if (current === 'pass' || current === 'return') {
+        if (current === 'return') {
             state.dedent += 1;
         }
-        if ((current === '->' &&
+        if (((current === '->' || current === '=>') &&
                   !state.lambda &&
                   state.scopes[0].type == 'coffee' &&
                   stream.peek() === '')
@@ -251,6 +260,14 @@ CodeMirror.defineMode('coffeescript', function(conf) {
         if (delimiter_index !== -1) {
             indent(stream, state, '])}'.slice(delimiter_index, delimiter_index+1));
         }
+        if (indentKeywords.exec(current)){
+            indent(stream, state);
+        }
+        if (current == 'then'){
+            dedent(stream, state);
+        }
+        
+
         if (style === 'dedent') {
             if (dedent(stream, state)) {
                 return ERRORCLASS;

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

@@ -4,7 +4,7 @@ CodeMirror.defineMode("css", function(config) {
 
   function tokenBase(stream, state) {
     var ch = stream.next();
-    if (ch == "@") {stream.eatWhile(/\w/); return ret("meta", stream.current());}
+    if (ch == "@") {stream.eatWhile(/[\w\\\-]/); return ret("meta", stream.current());}
     else if (ch == "/" && stream.eat("*")) {
       state.tokenize = tokenCComment;
       return tokenCComment(stream, state);
@@ -20,7 +20,7 @@ CodeMirror.defineMode("css", function(config) {
       return state.tokenize(stream, state);
     }
     else if (ch == "#") {
-      stream.eatWhile(/\w/);
+      stream.eatWhile(/[\w\\\-]/);
       return ret("atom", "hash");
     }
     else if (ch == "!") {
@@ -38,7 +38,7 @@ CodeMirror.defineMode("css", function(config) {
       return ret(null, ch);
     }
     else {
-      stream.eatWhile(/[\w\\\-_]/);
+      stream.eatWhile(/[\w\\\-]/);
       return ret("variable", "variable");
     }
   }

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

@@ -75,6 +75,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         return ret("operator", null, stream.current());
       }
     }
+    else if (ch == "#") {
+        stream.skipToEnd();
+        return ret("error", "error");
+    }
     else if (isOperatorChar.test(ch)) {
       stream.eatWhile(isOperatorChar);
       return ret("operator", null, stream.current());

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

@@ -0,0 +1,42 @@
+CodeMirror.defineMode("jinja2", function(config, parserConf) {
+    var keywords = ["block", "endblock", "for", "endfor", "in", "true", "false", 
+                    "loop", "none", "self", "super", "if", "as", "not", "and",
+                    "else", "import", "with", "without", "context"];
+    keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
+
+    function tokenBase (stream, state) {
+        var ch = stream.next();
+        if (ch == "{") {
+            if (ch = stream.eat(/\{|%|#/)) {
+                stream.eat("-");
+                state.tokenize = inTag(ch);
+                return "tag";
+            }
+        }
+    }
+    function inTag (close) {
+        if (close == "{") {
+            close = "}";
+        }
+        return function (stream, state) {
+            var ch = stream.next();
+            if ((ch == close || (ch == "-" && stream.eat(close)))
+                && stream.eat("}")) {
+                state.tokenize = tokenBase;
+                return "tag";
+            }
+            if (stream.match(keywords)) {
+                return "keyword";
+            }
+            return close == "#" ? "comment" : "string";
+        };
+    }
+    return {
+        startState: function () {
+            return {tokenize: tokenBase};
+        },
+        token: function (stream, state) {
+            return state.tokenize(stream, state);
+        }
+    }; 
+});

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

@@ -123,8 +123,10 @@ CodeMirror.defineMode("lua", function(config, parserConfig) {
         else if (builtins.test(word)) style = "builtin";
 	else if (specials.test(word)) style = "variable-2";
       }
-      if (indentTokens.test(word)) ++state.indentDepth;
-      else if (dedentTokens.test(word)) --state.indentDepth;
+      if ((style != "lua-comment") && (style != "lua-string")){
+        if (indentTokens.test(word)) ++state.indentDepth;
+        else if (dedentTokens.test(word)) --state.indentDepth;
+      }
       return style;
     },
 

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

@@ -0,0 +1,230 @@
+CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
+
+  var htmlMode = CodeMirror.getMode(cmCfg, { name: 'xml', htmlMode: true });
+
+  var header   = 'header'
+  ,   code     = 'code'
+  ,   quote    = 'quote'
+  ,   list     = 'list'
+  ,   hr       = 'hr'
+  ,   linktext = 'linktext'
+  ,   linkhref = 'linkhref'
+  ,   em       = 'em'
+  ,   strong   = 'strong'
+  ,   emstrong = 'emstrong';
+
+  var hrRE = /^[*-=_]/
+  ,   ulRE = /^[*-+]\s+/
+  ,   olRE = /^[0-9]\.\s+/
+  ,   headerRE = /^(?:\={3,}|-{3,})$/
+  ,   codeRE = /^(k:\t|\s{4,})/
+  ,   textRE = /^[^\[*_\\<>`]+/;
+
+  function switchInline(stream, state, f) {
+    state.f = state.inline = f;
+    return f(stream, state);
+  }
+
+  function switchBlock(stream, state, f) {
+    state.f = state.block = f;
+    return f(stream, state);
+  }
+
+
+  // Blocks
+
+  function blockNormal(stream, state) {
+    if (stream.match(codeRE)) {
+      stream.skipToEnd();
+      return code;
+    }
+    
+    if (stream.eatSpace()) {
+      return null;
+    }
+    
+    if (stream.peek() === '#' || stream.match(headerRE)) {
+      stream.skipToEnd();
+      return header;
+    }
+    if (stream.eat('>')) {
+      state.indentation++;
+      return quote;
+    }
+    if (stream.peek() === '<') {
+      return switchBlock(stream, state, htmlBlock);
+    }
+    if (stream.peek() === '[') {
+      return switchInline(stream, state, footnoteLink);
+    }
+    if (hrRE.test(stream.peek())) {
+      var re = new RegExp('(?:\s*['+stream.peek()+']){3,}$');
+      if (stream.match(re, true)) {
+        return hr;
+      }
+    }
+    
+    var match;
+    if (match = stream.match(ulRE, true) || stream.match(olRE, true)) {
+      state.indentation += match[0].length;
+      return list;
+    }
+    
+    return switchInline(stream, state, state.inline);
+  }
+
+  function htmlBlock(stream, state) {
+    var type = htmlMode.token(stream, state.htmlState);
+    if (stream.eol() && !state.htmlState.context) {
+      state.block = blockNormal;
+    }
+    return type;
+  }
+
+
+  // Inline
+
+  function inlineNormal(stream, state) {
+    function getType() {
+      return state.strong ? (state.em ? emstrong : strong)
+                          : (state.em ? em       : null);
+    }
+    
+    if (stream.match(textRE, true)) {
+      return getType();
+    }
+    
+    var ch = stream.next();
+    
+    if (ch === '\\') {
+      stream.next();
+      return getType();
+    }
+    if (ch === '`') {
+      return switchInline(stream, state, inlineElement(code, '`'));
+    }
+    if (ch === '<') {
+      return switchInline(stream, state, inlineElement(linktext, '>'));
+    }
+    if (ch === '[') {
+      return switchInline(stream, state, linkText);
+    }
+    
+    var t = getType();
+    if (ch === '*' || ch === '_') {
+      if (stream.eat(ch)) {
+        return (state.strong = !state.strong) ? getType() : t;
+      }
+      return (state.em = !state.em) ? getType() : t;
+    }
+    
+    return getType();
+  }
+
+  function linkText(stream, state) {
+    while (!stream.eol()) {
+      var ch = stream.next();
+      if (ch === '\\') stream.next();
+      if (ch === ']') {
+        state.inline = state.f = linkHref;
+        return linktext;
+      }
+    }
+    return linktext;
+  }
+
+  function linkHref(stream, state) {
+    stream.eatSpace();
+    var ch = stream.next();
+    if (ch === '(' || ch === '[') {
+      return switchInline(stream, state, inlineElement(linkhref, ch === '(' ? ')' : ']'));
+    }
+    return 'error';
+  }
+
+  function footnoteLink(stream, state) {
+    if (stream.match(/^[^\]]*\]:/, true)) {
+      state.f = footnoteUrl;
+      return linktext;
+    }
+    return switchInline(stream, state, inlineNormal);
+  }
+
+  function footnoteUrl(stream, state) {
+    stream.eatSpace();
+    stream.match(/^[^\s]+/, true);
+    state.f = state.inline = inlineNormal;
+    return linkhref;
+  }
+
+  function inlineElement(type, endChar, next) {
+    next = next || inlineNormal;
+    return function(stream, state) {
+      while (!stream.eol()) {
+        var ch = stream.next();
+        if (ch === '\\') stream.next();
+        if (ch === endChar) {
+          state.inline = state.f = next;
+          return type;
+        }
+      }
+      return type;
+    };
+  }
+
+  return {
+    startState: function() {
+      return {
+        f: blockNormal,
+        
+        block: blockNormal,
+        htmlState: htmlMode.startState(),
+        indentation: 0,
+        
+        inline: inlineNormal,
+        em: false,
+        strong: false
+      };
+    },
+
+    copyState: function(s) {
+      return {
+        f: s.f,
+        
+        block: s.block,
+        htmlState: CodeMirror.copyState(htmlMode, s.htmlState),
+        indentation: s.indentation,
+        
+        inline: s.inline,
+        em: s.em,
+        strong: s.strong
+      };
+    },
+
+    token: function(stream, state) {
+      if (stream.sol()) {
+        state.f = state.block;
+        var previousIndentation = state.indentation
+        ,   currentIndentation = 0;
+        while (previousIndentation > 0) {
+          if (stream.eat(' ')) {
+            previousIndentation--;
+            currentIndentation++;
+          } else if (previousIndentation >= 4 && stream.eat('\t')) {
+            previousIndentation -= 4;
+            currentIndentation += 4;
+          } else {
+            break;
+          }
+        }
+        state.indentation = currentIndentation;
+        
+        if (currentIndentation > 0) return null;
+      }
+      return state.f(stream, state);
+    }
+  };
+
+});
+
+CodeMirror.defineMIME("text/x-markdown", "markdown");