codemirror-rails 2.3 → 2.21

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

@@ -13,10 +13,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   strong   = 'strong'
   ,   emstrong = 'emstrong';
 
-  var hrRE = /^([*\-=_])(?:\s*\1){2,}\s*$/
-  ,   ulRE = /^[*\-+]\s+/
-  ,   olRE = /^[0-9]+\.\s+/
+  var hrRE = /^[*-=_]/
+  ,   ulRE = /^[*-+]\s+/
+  ,   olRE = /^[0-9]\.\s+/
   ,   headerRE = /^(?:\={3,}|-{3,})$/
+  ,   codeRE = /^(k:\t|\s{4,})/
   ,   textRE = /^[^\[*_\\<>`]+/;
 
   function switchInline(stream, state, f) {
@@ -32,32 +33,36 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   // Blocks
 
-  function blankLine(state) {
-    // Reset EM state
-    state.em = false;
-    // Reset STRONG state
-    state.strong = false;
-    return null;
-  }
-
   function blockNormal(stream, state) {
-    var match;
-    if (state.indentationDiff >= 4) {
-      state.indentation -= state.indentationDiff;
+    if (stream.match(codeRE)) {
       stream.skipToEnd();
       return code;
-    } else if (stream.eatSpace()) {
+    }
+    
+    if (stream.eatSpace()) {
       return null;
-    } else if (stream.peek() === '#' || stream.match(headerRE)) {
-      state.header = true;
-    } else if (stream.eat('>')) {
+    }
+    
+    if (stream.peek() === '#' || stream.match(headerRE)) {
+      stream.skipToEnd();
+      return header;
+    }
+    if (stream.eat('>')) {
       state.indentation++;
-      state.quote = true;
-    } else if (stream.peek() === '[') {
+      return quote;
+    }
+    if (stream.peek() === '[') {
       return switchInline(stream, state, footnoteLink);
-    } else if (stream.match(hrRE, true)) {
-      return hr;
-    } else if (match = stream.match(ulRE, true) || stream.match(olRE, true)) {
+    }
+    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;
     }
@@ -77,15 +82,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   // Inline
   function getType(state) {
-    var styles = [];
-    
-    if (state.strong) { styles.push(state.em ? emstrong : strong); }
-    else if (state.em) { styles.push(em); }
-    
-    if (state.header) { styles.push(header); }
-    if (state.quote) { styles.push(quote); }
-
-    return styles.length ? styles.join(' ') : null;
+    return state.strong ? (state.em ? emstrong : strong)
+                        : (state.em ? em       : null);
   }
 
   function handleText(stream, state) {
@@ -194,9 +192,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         inline: inlineNormal,
         text: handleText,
         em: false,
-        strong: false,
-        header: false,
-        quote: false
+        strong: false
       };
     },
 
@@ -211,35 +207,36 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         inline: s.inline,
         text: s.text,
         em: s.em,
-        strong: s.strong,
-        header: s.header,
-        quote: s.quote
+        strong: s.strong
       };
     },
 
     token: function(stream, state) {
       if (stream.sol()) {
-        if (stream.match(/^\s*$/, true)) { return blankLine(state); }
-
-        // Reset state.header
-        state.header = false;
-        // Reset state.quote
-        state.quote = false;
-
         state.f = state.block;
-        var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, '    ').length;
-        state.indentationDiff = indentation - state.indentation;
-        state.indentation = indentation;
-        if (indentation > 0) { return null; }
+        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);
     },
 
-    blankLine: blankLine,
-
     getType: getType
   };
 
-}, "xml");
+});
 
 CodeMirror.defineMIME("text/x-markdown", "markdown");

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

@@ -7,9 +7,11 @@ CodeMirror.defineMode("pascal", function(config) {
   var keywords = words("and array begin case const div do downto else end file for forward integer " +
                        "boolean char function goto if in label mod nil not of or packed procedure " +
                        "program record repeat set string then to type until var while with");
+  var blockKeywords = words("case do else for if switch while struct then of");
   var atoms = {"null": true};
 
   var isOperatorChar = /[+\-*&%=<>!?|\/]/;
+  var curPunc;
 
   function tokenBase(stream, state) {
     var ch = stream.next();
@@ -26,6 +28,7 @@ CodeMirror.defineMode("pascal", function(config) {
       return tokenComment(stream, state);
     }
     if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+      curPunc = ch;
       return null
     }
     if (/\d/.test(ch)) {
@@ -44,7 +47,10 @@ CodeMirror.defineMode("pascal", function(config) {
     }
     stream.eatWhile(/[\w\$_]/);
     var cur = stream.current();
-    if (keywords.propertyIsEnumerable(cur)) return "keyword";
+    if (keywords.propertyIsEnumerable(cur)) {
+      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+      return "keyword";
+    }
     if (atoms.propertyIsEnumerable(cur)) return "atom";
     return "word";
   }
@@ -73,17 +79,55 @@ CodeMirror.defineMode("pascal", function(config) {
     return "comment";
   }
 
+  function Context(indented, column, type, align, prev) {
+    this.indented = indented;
+    this.column = column;
+    this.type = type;
+    this.align = align;
+    this.prev = prev;
+  }
+  function pushContext(state, col, type) {
+    return state.context = new Context(state.indented, col, type, null, state.context);
+  }
+  function popContext(state) {
+    var t = state.context.type;
+    if (t == ")" || t == "]" )
+      state.indented = state.context.indented;
+    return state.context = state.context.prev;
+  }
+
   // Interface
 
   return {
     startState: function(basecolumn) {
-      return {tokenize: null};
+      return {
+        tokenize: null,
+        context: new Context((basecolumn || 0) - config.indentUnit, 0, "top", false),
+        indented: 0,
+        startOfLine: true
+      };
     },
 
     token: function(stream, state) {
+      var ctx = state.context;
+      if (stream.sol()) {
+        if (ctx.align == null) ctx.align = false;
+        state.indented = stream.indentation();
+        state.startOfLine = true;
+      }
       if (stream.eatSpace()) return null;
+      curPunc = null;
       var style = (state.tokenize || tokenBase)(stream, state);
       if (style == "comment" || style == "meta") return style;
+      if (ctx.align == null) ctx.align = true;
+
+      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
+      else if (curPunc == "[") pushContext(state, stream.column(), "]");
+      else if (curPunc == "(") pushContext(state, stream.column(), ")");
+      else if (curPunc == ctx.type) popContext(state);
+      else if ( ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
+        pushContext(state, stream.column(), "statement");
+      state.startOfLine = false;
       return style;
     },
 

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

@@ -324,7 +324,7 @@ CodeMirror.defineMode("perl",function(config,parserConfig){
 		hex				:1,	// - convert a string to a hexadecimal number
 		'import'			:1,	// - patch a module's namespace into your own
 		index				:1,	// - find a substring within a string
-		'int'				:1,	// - get the integer portion of a number
+		int				:1,	// - get the integer portion of a number
 		ioctl				:1,	// - system-dependent device control system call
 		'join'				:1,	// - join a list into a string using a separator
 		keys				:1,	// - retrieve list of indices from a hash

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

@@ -13,12 +13,11 @@
   }
   var phpConfig = {
     name: "clike",
-    keywords: keywords("abstract and array as break case catch class clone const continue declare default " +
-                       "do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final " +
-                       "for foreach function global goto if implements interface instanceof namespace " +
-                       "new or private protected public static switch throw trait try use var while xor " +
-                       "die echo empty exit eval include include_once isset list require require_once return " +
-                       "print unset __halt_compiler self static parent"),
+    keywords: keywords("abstract and array as break case catch cfunction class clone const continue declare " +
+                       "default do else elseif enddeclare endfor endforeach endif endswitch endwhile extends " +
+                       "final for foreach function global goto if implements interface instanceof namespace " +
+                       "new or private protected public static switch throw try use var while xor return" +
+                       "die echo empty exit eval include include_once isset list require require_once print unset"),
     blockKeywords: keywords("catch do else elseif for foreach if switch try while"),
     atoms: keywords("true false null TRUE FALSE NULL"),
     multiLineStrings: true,
@@ -36,15 +35,8 @@
         return false;
       },
       "#": function(stream, state) {
-        while (!stream.eol() && !stream.match("?>", false)) stream.next();
+        stream.skipToEnd();
         return "comment";
-      },
-      "/": function(stream, state) {
-        if (stream.eat("/")) {
-          while (!stream.eol() && !stream.match("?>", false)) stream.next();
-          return "comment";
-        }
-        return false;
       }
     }
   };
@@ -56,57 +48,38 @@
     var phpMode = CodeMirror.getMode(config, phpConfig);
 
     function dispatch(stream, state) { // TODO open PHP inside text/css
-      var isPHP = state.mode == "php";
-      if (stream.sol() && state.pending != '"') state.pending = null;
       if (state.curMode == htmlMode) {
-        if (stream.match(/^<\?\w*/)) {
+        var style = htmlMode.token(stream, state.curState);
+        if (style == "meta" && /^<\?/.test(stream.current())) {
           state.curMode = phpMode;
           state.curState = state.php;
-          state.curClose = "?>";
-	  state.mode = "php";
-          return "meta";
+          state.curClose = /^\?>/;
+		  state.mode =  'php';
         }
-        if (state.pending == '"') {
-          while (!stream.eol() && stream.next() != '"') {}
-          var style = "string";
-        } else if (state.pending && stream.pos < state.pending.end) {
-          stream.pos = state.pending.end;
-          var style = state.pending.style;
-        } else {
-          var style = htmlMode.token(stream, state.curState);
-        }
-        state.pending = null;
-        var cur = stream.current(), openPHP = cur.search(/<\?/);
-        if (openPHP != -1) {
-          if (style == "string" && /\"$/.test(cur) && !/\?>/.test(cur)) state.pending = '"';
-          else state.pending = {end: stream.pos, style: style};
-          stream.backUp(cur.length - openPHP);
-        } else if (style == "tag" && stream.current() == ">" && state.curState.context) {
+        else if (style == "tag" && stream.current() == ">" && state.curState.context) {
           if (/^script$/i.test(state.curState.context.tagName)) {
             state.curMode = jsMode;
             state.curState = jsMode.startState(htmlMode.indent(state.curState, ""));
             state.curClose = /^<\/\s*script\s*>/i;
-	    state.mode = "javascript";
+			state.mode =  'javascript';
           }
           else if (/^style$/i.test(state.curState.context.tagName)) {
             state.curMode = cssMode;
             state.curState = cssMode.startState(htmlMode.indent(state.curState, ""));
-            state.curClose = /^<\/\s*style\s*>/i;
-            state.mode = "css";
+            state.curClose =  /^<\/\s*style\s*>/i;
+            state.mode =  'css';
           }
         }
         return style;
-      } else if ((!isPHP || state.php.tokenize == null) &&
-                 stream.match(state.curClose, isPHP)) {
+      }
+      else if (stream.match(state.curClose, false)) {
         state.curMode = htmlMode;
         state.curState = state.html;
         state.curClose = null;
-	state.mode = "html";
-        if (isPHP) return "meta";
-        else return dispatch(stream, state);
-      } else {
-        return state.curMode.token(stream, state.curState);
+		state.mode =  'html';
+        return dispatch(stream, state);
       }
+      else return state.curMode.token(stream, state.curState);
     }
 
     return {
@@ -114,11 +87,10 @@
         var html = htmlMode.startState();
         return {html: html,
                 php: phpMode.startState(),
-                curMode: parserConfig.startOpen ? phpMode : htmlMode,
-                curState: parserConfig.startOpen ? phpMode.startState() : html,
-                curClose: parserConfig.startOpen ? /^\?>/ : null,
-		mode: parserConfig.startOpen ? "php" : "html",
-                pending: null}
+                curMode:	parserConfig.startOpen ? phpMode : htmlMode,
+                curState:	parserConfig.startOpen ? phpMode.startState() : html,
+                curClose:	parserConfig.startOpen ? /^\?>/ : null,
+				mode:		parserConfig.startOpen ? 'php' : 'html'}
       },
 
       copyState: function(state) {
@@ -128,8 +100,7 @@
         else if (state.curState == php) cur = phpNew;
         else cur = CodeMirror.copyState(state.curMode, state.curState);
         return {html: htmlNew, php: phpNew, curMode: state.curMode, curState: cur,
-                curClose: state.curClose, mode: state.mode,
-                pending: state.pending};
+                curClose: state.curClose, mode: state.mode};
       },
 
       token: dispatch,
@@ -143,7 +114,7 @@
 
       electricChars: "/{}:"
     }
-  }, "xml", "clike", "javascript", "css");
+  });
   CodeMirror.defineMIME("application/x-httpd-php", "php");
   CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true});
   CodeMirror.defineMIME("text/x-php", phpConfig);

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

@@ -249,30 +249,32 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
 
         // Handle '.' connected identifiers
         if (current === '.') {
-            style = stream.match(identifiers, false) ? null : ERRORCLASS;
-            if (style === null && state.lastToken === 'meta') {
-                // Apply 'meta' style to '.' connected identifiers when
-                // appropriate.
-                style = 'meta';
+            style = state.tokenize(stream, state);
+            current = stream.current();
+            if (style === 'variable' || style === 'builtin') {
+                return 'variable';
+            } else {
+                return ERRORCLASS;
             }
-            return style;
         }
         
         // Handle decorators
         if (current === '@') {
-            return stream.match(identifiers, false) ? 'meta' : ERRORCLASS;
-        }
-
-        if ((style === 'variable' || style === 'builtin')
-            && state.lastToken === 'meta') {
-            style = 'meta';
+            style = state.tokenize(stream, state);
+            current = stream.current();
+            if (style === 'variable'
+                || current === '@staticmethod'
+                || current === '@classmethod') {
+                return 'meta';
+            } else {
+                return ERRORCLASS;
+            }
         }
         
         // Handle scope changes.
         if (current === 'pass' || current === 'return') {
             state.dedent += 1;
         }
-        if (current === 'lambda') state.lambda = true;
         if ((current === ':' && !state.lambda && state.scopes[0].type == 'py')
             || indentInfo === 'indent') {
             indent(stream, state);
@@ -314,7 +316,7 @@ CodeMirror.defineMode("python", function(conf, parserConf) {
         token: function(stream, state) {
             var style = tokenLexer(stream, state);
             
-            state.lastToken = style;
+            state.lastToken = {style:style, content: stream.current()};
             
             if (stream.eol() && stream.lambda) {
                 state.lambda = false;

data/vendor/assets/javascripts/codemirror/modes/rpm-spec.js

@@ -14,7 +14,7 @@ CodeMirror.defineMode("spec", function(config, modeConfig) {
         return {
           controlFlow: false,
           macroParameters: false,
-          section: false
+          section: false,
         };
     },
     token: function (stream, state) {