codemirror-rails 3.15 → 3.16

data/vendor/assets/javascripts/codemirror/addons/scroll/scrollpastend.js

@@ -0,0 +1,34 @@
+(function() {
+  "use strict";
+
+  CodeMirror.defineOption("scrollPastEnd", false, function(cm, val, old) {
+    if (old && old != CodeMirror.Init) {
+      cm.off("change", onChange);
+      cm.display.lineSpace.parentNode.style.paddingBottom = "";
+      cm.state.scrollPastEndPadding = null;
+    }
+    if (val) {
+      cm.on("change", onChange);
+      updateBottomMargin(cm);
+    }
+  });
+
+  function onChange(cm, change) {
+    if (CodeMirror.changeEnd(change).line == cm.lastLine())
+      updateBottomMargin(cm);
+  }
+
+  function updateBottomMargin(cm) {
+    var padding = "";
+    if (cm.lineCount() > 1) {
+      var totalH = cm.display.scroller.clientHeight - 30,
+          lastLineH = cm.getLineHandle(cm.lastLine()).height;
+      padding = (totalH - lastLineH) + "px";
+    }
+    if (cm.state.scrollPastEndPadding != padding) {
+      cm.state.scrollPastEndPadding = padding;
+      cm.display.lineSpace.parentNode.style.paddingBottom = padding;
+      cm.setSize();
+    }
+  }
+})();

data/vendor/assets/javascripts/codemirror/addons/search/match-highlighter.js

@@ -15,15 +15,18 @@
 (function() {
   var DEFAULT_MIN_CHARS = 2;
   var DEFAULT_TOKEN_STYLE = "matchhighlight";
+  var DEFAULT_DELAY = 100;
 
   function State(options) {
     if (typeof options == "object") {
       this.minChars = options.minChars;
       this.style = options.style;
       this.showToken = options.showToken;
+      this.delay = options.delay;
     }
     if (this.style == null) this.style = DEFAULT_TOKEN_STYLE;
     if (this.minChars == null) this.minChars = DEFAULT_MIN_CHARS;
+    if (this.delay == null) this.delay = DEFAULT_DELAY;
     this.overlay = this.timeout = null;
   }
 
@@ -45,7 +48,7 @@
   function cursorActivity(cm) {
     var state = cm.state.matchHighlighter;
     clearTimeout(state.timeout);
-    state.timeout = setTimeout(function() {highlightMatches(cm);}, 100);
+    state.timeout = setTimeout(function() {highlightMatches(cm);}, state.delay);
   }
 
   function highlightMatches(cm) {

data/vendor/assets/javascripts/codemirror/keymaps/vim.js

@@ -1104,6 +1104,11 @@
             if (vim.visualLine) {
               if (cursorIsBefore(selectionStart, selectionEnd)) {
                 selectionStart.ch = 0;
+
+                var lastLine = cm.lastLine();
+                if (selectionEnd.line > lastLine) {
+                  selectionEnd.line = lastLine;
+                }
                 selectionEnd.ch = lineLength(cm, selectionEnd.line);
               } else {
                 selectionEnd.ch = 0;

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

@@ -366,8 +366,8 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "drop-initial-before-align", "drop-initial-size", "drop-initial-value",
     "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis",
     "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap",
-    "float", "float-offset", "font", "font-feature-settings", "font-family",
-    "font-kerning", "font-language-override", "font-size", "font-size-adjust",
+    "float", "float-offset", "flow-from", "flow-into", "font", "font-feature-settings",
+    "font-family", "font-kerning", "font-language-override", "font-size", "font-size-adjust",
     "font-stretch", "font-style", "font-synthesis", "font-variant",
     "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
     "font-variant-ligatures", "font-variant-numeric", "font-variant-position",
@@ -391,10 +391,12 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "page", "page-break-after", "page-break-before", "page-break-inside",
     "page-policy", "pause", "pause-after", "pause-before", "perspective",
     "perspective-origin", "pitch", "pitch-range", "play-during", "position",
-    "presentation-level", "punctuation-trim", "quotes", "rendering-intent",
-    "resize", "rest", "rest-after", "rest-before", "richness", "right",
-    "rotation", "rotation-point", "ruby-align", "ruby-overhang",
-    "ruby-position", "ruby-span", "size", "speak", "speak-as", "speak-header",
+    "presentation-level", "punctuation-trim", "quotes", "region-break-after",
+    "region-break-before", "region-break-inside", "region-fragment",
+    "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
+    "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang",
+    "ruby-position", "ruby-span", "shape-inside", "shape-outside", "size",
+    "speak", "speak-as", "speak-header",
     "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set",
     "tab-size", "table-layout", "target", "target-name", "target-new",
     "target-position", "text-align", "text-align-last", "text-decoration",
@@ -432,7 +434,7 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "darkslateblue", "darkslategray", "darkturquoise", "darkviolet",
     "deeppink", "deepskyblue", "dimgray", "dodgerblue", "firebrick",
     "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite",
-    "gold", "goldenrod", "gray", "green", "greenyellow", "honeydew",
+    "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "honeydew",
     "hotpink", "indianred", "indigo", "ivory", "khaki", "lavender",
     "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral",
     "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightpink",
@@ -455,22 +457,22 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "above", "absolute", "activeborder", "activecaption", "afar",
     "after-white-space", "ahead", "alias", "all", "all-scroll", "alternate",
     "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
-    "arabic-indic", "armenian", "asterisks", "auto", "avoid", "background",
-    "backwards", "baseline", "below", "bidi-override", "binary", "bengali",
-    "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
-    "both", "bottom", "break-all", "break-word", "button", "button-bevel",
+    "arabic-indic", "armenian", "asterisks", "auto", "avoid", "avoid-column", "avoid-page",
+    "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",
+    "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
+    "both", "bottom", "break", "break-all", "break-word", "button", "button-bevel",
     "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "cambodian",
     "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
     "cell", "center", "checkbox", "circle", "cjk-earthly-branch",
     "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
-    "col-resize", "collapse", "compact", "condensed", "contain", "content",
+    "col-resize", "collapse", "column", "compact", "condensed", "contain", "content",
     "content-box", "context-menu", "continuous", "copy", "cover", "crop",
     "cross", "crosshair", "currentcolor", "cursive", "dashed", "decimal",
     "decimal-leading-zero", "default", "default-button", "destination-atop",
     "destination-in", "destination-out", "destination-over", "devanagari",
     "disc", "discard", "document", "dot-dash", "dot-dot-dash", "dotted",
     "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
-    "element", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede",
+    "element", "ellipse", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede",
     "ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er",
     "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er",
     "ethiopic-halehame-aa-et", "ethiopic-halehame-am-et",
@@ -486,7 +488,7 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
     "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
     "inline-block", "inline-table", "inset", "inside", "intrinsic", "invert",
-    "italic", "justify", "kannada", "katakana", "katakana-iroha", "khmer",
+    "italic", "justify", "kannada", "katakana", "katakana-iroha", "keep-all", "khmer",
     "landscape", "lao", "large", "larger", "left", "level", "lighter",
     "line-through", "linear", "lines", "list-item", "listbox", "listitem",
     "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
@@ -505,11 +507,11 @@ CodeMirror.defineMode("css-base", function(config, parserConfig) {
     "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
     "ns-resize", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
     "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
-    "outside", "overlay", "overline", "padding", "padding-box", "painted",
-    "paused", "persian", "plus-darker", "plus-lighter", "pointer", "portrait",
-    "pre", "pre-line", "pre-wrap", "preserve-3d", "progress", "push-button",
-    "radio", "read-only", "read-write", "read-write-plaintext-only", "relative",
-    "repeat", "repeat-x", "repeat-y", "reset", "reverse", "rgb", "rgba",
+    "outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
+    "painted", "page", "paused", "persian", "plus-darker", "plus-lighter", "pointer",
+    "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d", "progress", "push-button",
+    "radio", "read-only", "read-write", "read-write-plaintext-only", "rectangle", "region",
+    "relative", "repeat", "repeat-x", "repeat-y", "reset", "reverse", "rgb", "rgba",
     "ridge", "right", "round", "row-resize", "rtl", "run-in", "running",
     "s-resize", "sans-serif", "scroll", "scrollbar", "se-resize", "searchfield",
     "searchfield-cancel-button", "searchfield-decoration",

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

@@ -11,22 +11,15 @@ CodeMirror.defineMIME("text/x-erlang", "erlang");
 
 CodeMirror.defineMode("erlang", function(cmCfg) {
 
-  function rval(state,stream,type) {
+  function rval(state,_stream,type) {
     // distinguish between "." as terminator and record field operator
-    if (type == "record") {
-      state.context = "record";
-    }else{
-      state.context = false;
-    }
+    state.in_record = (type == "record");
 
-    // remember last significant bit on last line for indenting
-    if (type != "whitespace" && type != "comment") {
-      state.lastToken = stream.current();
-    }
     //     erlang             -> CodeMirror tag
     switch (type) {
       case "atom":        return "atom";
       case "attribute":   return "attribute";
+      case "boolean":     return "special";
       case "builtin":     return "builtin";
       case "comment":     return "comment";
       case "fun":         return "meta";
@@ -55,6 +48,7 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     "after","begin","catch","case","cond","end","fun","if",
     "let","of","query","receive","try","when"];
 
+  var separatorRE        = /[\->\.,:;]/;
   var separatorWords = [
     "->",";",":",".",","];
 
@@ -62,12 +56,15 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     "and","andalso","band","bnot","bor","bsl","bsr","bxor",
     "div","not","or","orelse","rem","xor"];
 
+  var symbolRE     = /[\+\-\*\/<>=\|:!]/;
   var symbolWords = [
-    "+","-","*","/",">",">=","<","=<","=:=","==","=/=","/=","||","<-"];
+    "+","-","*","/",">",">=","<","=<","=:=","==","=/=","/=","||","<-","!"];
 
+  var openParenRE  = /[<\(\[\{]/;
   var openParenWords = [
     "<<","(","[","{"];
 
+  var closeParenRE = /[>\)\]\}]/;
   var closeParenWords = [
     "}","]",")",">>"];
 
@@ -102,53 +99,39 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     "term_to_binary","time","throw","tl","trunc","tuple_size",
     "tuple_to_list","unlink","unregister","whereis"];
 
-  // ignored for indenting purposes
-  var ignoreWords = [
-    ",", ":", "catch", "after", "of", "cond", "let", "query"];
-
+// [Ø-Þ] [À-Ö]
+// [ß-ö] [ø-ÿ]
+  var anumRE       = /[\w@Ø-ÞÀ-Öß-öø-ÿ]/;
+  var escapesRE    =
+    /[0-7]{1,3}|[bdefnrstv\\"']|\^[a-zA-Z]|x[0-9a-zA-Z]{2}|x{[0-9a-zA-Z]+}/;
 
-  var smallRE      = /[a-z_]/;
-  var largeRE      = /[A-Z_]/;
-  var digitRE      = /[0-9]/;
-  var octitRE      = /[0-7]/;
-  var anumRE       = /[a-z_A-Z0-9]/;
-  var symbolRE     = /[\+\-\*\/<>=\|:]/;
-  var openParenRE  = /[<\(\[\{]/;
-  var closeParenRE = /[>\)\]\}]/;
-  var sepRE        = /[\->\.,:;]/;
+  function tokenize(stream, state) {
 
-  function isMember(element,list) {
-    return (-1 < list.indexOf(element));
-  }
+    // in multi-line string
+    if (state.in_string) {
+      state.in_string =  (!doubleQuote(stream));
+      return rval(state,stream,"string");
+    }
 
-  function isPrev(stream,string) {
-    var start = stream.start;
-    var len = string.length;
-    if (len <= start) {
-      var word = stream.string.slice(start-len,start);
-      return word == string;
-    }else{
-      return false;
+    // in multi-line atom
+    if (state.in_atom) {
+      state.in_atom =  (!singleQuote(stream));
+      return rval(state,stream,"atom");
     }
-  }
 
-  function tokenize(stream, state) {
+    // whitespace
     if (stream.eatSpace()) {
       return rval(state,stream,"whitespace");
     }
 
     // attributes and type specs
-    if ((peekToken(state).token == "" || peekToken(state).token == ".") &&
-        stream.peek() == '-') {
-      stream.next();
-      if (stream.eat(smallRE) && stream.eatWhile(anumRE)) {
-        if (isMember(stream.current(),typeWords)) {
-          return rval(state,stream,"type");
-        }else{
-          return rval(state,stream,"attribute");
-        }
+    if ((peekToken(state).token == "") &&
+        stream.match(/-\s*[a-zß-öø-ÿ][\wØ-ÞÀ-Öß-öø-ÿ]*/)) {
+      if (isMember(stream.current(),typeWords)) {
+        return rval(state,stream,"type");
+      }else{
+        return rval(state,stream,"attribute");
       }
-      stream.backUp(1);
     }
 
     var ch = stream.next();
@@ -166,57 +149,54 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     }
 
     // record
-    if ( ch == "#") {
+    if (ch == "#") {
       stream.eatWhile(anumRE);
       return rval(state,stream,"record");
     }
 
-    // char
-    if ( ch == "$") {
-      if (stream.next() == "\\") {
-        if (!stream.eatWhile(octitRE)) {
-          stream.next();
-        }
+    // dollar escape
+    if ( ch == "$" ) {
+      if (stream.next() == "\\" && !stream.match(escapesRE)) {
+        return rval(state,stream,"error");
       }
-      return rval(state,stream,"string");
+      return rval(state,stream,"number");
     }
 
     // quoted atom
     if (ch == '\'') {
-      if (singleQuote(stream)) {
-        return rval(state,stream,"atom");
-      }else{
-        return rval(state,stream,"error");
+      if (!(state.in_atom = (!singleQuote(stream)))) {
+        if (stream.match(/\s*\/\s*[0-9]/,false)) {
+          stream.match(/\s*\/\s*[0-9]/,true);
+          popToken(state);
+          return rval(state,stream,"fun");      // 'f'/0 style fun
+        }
+        if (stream.match(/\s*\(/,false) || stream.match(/\s*:/,false)) {
+          return rval(state,stream,"function");
+        }
       }
+      return rval(state,stream,"atom");
     }
 
     // string
     if (ch == '"') {
-      if (doubleQuote(stream)) {
-        return rval(state,stream,"string");
-      }else{
-        return rval(state,stream,"error");
-      }
+      state.in_string = (!doubleQuote(stream));
+      return rval(state,stream,"string");
     }
 
     // variable
-    if (largeRE.test(ch)) {
+    if (/[A-Z_Ø-ÞÀ-Ö]/.test(ch)) {
       stream.eatWhile(anumRE);
       return rval(state,stream,"variable");
     }
 
     // atom/keyword/BIF/function
-    if (smallRE.test(ch)) {
+    if (/[a-z_ß-öø-ÿ]/.test(ch)) {
       stream.eatWhile(anumRE);
 
-      if (stream.peek() == "/") {
-        stream.next();
-        if (stream.eatWhile(digitRE)) {
-          return rval(state,stream,"fun");      // f/0 style fun
-        }else{
-          stream.backUp(1);
-          return rval(state,stream,"atom");
-        }
+      if (stream.match(/\s*\/\s*[0-9]/,false)) {
+        stream.match(/\s*\/\s*[0-9]/,true);
+        popToken(state);
+        return rval(state,stream,"fun");      // f/0 style fun
       }
 
       var w = stream.current();
@@ -224,37 +204,38 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
       if (isMember(w,keywordWords)) {
         pushToken(state,stream);
         return rval(state,stream,"keyword");
-      }
-      if (stream.peek() == "(") {
+      }else if (stream.match(/\s*\(/,false)) {
         // 'put' and 'erlang:put' are bifs, 'foo:put' is not
         if (isMember(w,bifWords) &&
             (!isPrev(stream,":") || isPrev(stream,"erlang:"))) {
           return rval(state,stream,"builtin");
+        }else if (isMember(w,guardWords)) {
+          return rval(state,stream,"guard");
         }else{
           return rval(state,stream,"function");
         }
-      }
-      if (isMember(w,guardWords)) {
-        return rval(state,stream,"guard");
-      }
-      if (isMember(w,operatorWords)) {
+      }else if (isMember(w,operatorWords)) {
         return rval(state,stream,"operator");
-      }
-      if (stream.peek() == ":") {
+      }else if (stream.match(/\s*:/,false)) {
         if (w == "erlang") {
           return rval(state,stream,"builtin");
         } else {
           return rval(state,stream,"function");
         }
+      }else if (isMember(w,["true","false"])) {
+        return rval(state,stream,"boolean");
+      }else{
+        return rval(state,stream,"atom");
       }
-      return rval(state,stream,"atom");
     }
 
     // number
+    var digitRE      = /[0-9]/;
+    var radixRE      = /[0-9a-zA-Z]/;         // 36#zZ style int
     if (digitRE.test(ch)) {
       stream.eatWhile(digitRE);
       if (stream.eat('#')) {
-        stream.eatWhile(digitRE);    // 16#10  style integer
+        stream.eatWhile(radixRE);    // 36#aZ  style integer
       } else {
         if (stream.eat('.')) {       // float
           stream.eatWhile(digitRE);
@@ -280,9 +261,9 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     }
 
     // separators
-    if (greedy(stream,sepRE,separatorWords)) {
+    if (greedy(stream,separatorRE,separatorWords)) {
       // distinguish between "." as terminator and record field operator
-      if (state.context == false) {
+      if (!state.in_record) {
         pushToken(state,stream);
       }
       return rval(state,stream,"separator");
@@ -296,6 +277,17 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     return rval(state,stream,null);
   }
 
+  function isPrev(stream,string) {
+    var start = stream.start;
+    var len = string.length;
+    if (len <= start) {
+      var word = stream.string.slice(start-len,start);
+      return word == string;
+    }else{
+      return false;
+    }
+  }
+
   function nongreedy(stream,re,words) {
     if (stream.current().length == 1 && re.test(stream.current())) {
       stream.backUp(1);
@@ -347,31 +339,37 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     return false;
   }
 
-  function Token(stream) {
-    this.token  = stream ? stream.current() : "";
-    this.column = stream ? stream.column() : 0;
-    this.indent = stream ? stream.indentation() : 0;
+  function isMember(element,list) {
+    return (-1 < list.indexOf(element));
   }
 
+/////////////////////////////////////////////////////////////////////////////
   function myIndent(state,textAfter) {
     var indent = cmCfg.indentUnit;
-    var outdentWords = ["after","catch"];
     var token = (peekToken(state)).token;
     var wordAfter = takewhile(textAfter,/[^a-z]/);
 
-    if (isMember(token,openParenWords)) {
-      return (peekToken(state)).column+token.length;
-    }else if (token == "." || token == ""){
+    if (state.in_string || state.in_atom) {
+      return CodeMirror.Pass;
+    }else if (token == "") {
       return 0;
+    }else if (isMember(token,openParenWords)) {
+      return (peekToken(state)).column+token.length;
+    }else if (token == "when") {
+      return (peekToken(state)).column+token.length+1;
+    }else if (token == "fun" && wordAfter == "") {
+      return (peekToken(state)).column+token.length;
     }else if (token == "->") {
-      if (wordAfter == "end") {
+      if (isMember(wordAfter,["end","after","catch"])) {
         return peekToken(state,2).column;
       }else if (peekToken(state,2).token == "fun") {
         return peekToken(state,2).column+indent;
+      }else if (peekToken(state,2).token == "") {
+        return indent;
       }else{
         return (peekToken(state)).indent+indent;
       }
-    }else if (isMember(wordAfter,outdentWords)) {
+    }else if (isMember(wordAfter,["after","catch","of"])) {
       return (peekToken(state)).indent;
     }else{
       return (peekToken(state)).column+indent;
@@ -383,6 +381,12 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     return m ? str.slice(0,m.index) : str;
   }
 
+  function Token(stream) {
+    this.token  = stream ? stream.current() : "";
+    this.column = stream ? stream.column() : 0;
+    this.indent = stream ? stream.indentation() : 0;
+  }
+
   function popToken(state) {
     return state.tokenStack.pop();
   }
@@ -400,7 +404,13 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
   function pushToken(state,stream) {
     var token = stream.current();
     var prev_token = peekToken(state).token;
-    if (isMember(token,ignoreWords)) {
+
+    if (token == ".") {
+      state.tokenStack = [];
+      return false;
+    }else if(isMember(token,[",", ":", "of", "cond", "let", "query"])) {
+      return false;
+    }else if (drop_last(prev_token,token)) {
       return false;
     }else if (drop_both(prev_token,token)) {
       popToken(state);
@@ -408,18 +418,25 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     }else if (drop_first(prev_token,token)) {
       popToken(state);
       return pushToken(state,stream);
+    }else if (isMember(token,["after","catch"])) {
+      return false;
     }else{
       state.tokenStack.push(new Token(stream));
       return true;
     }
   }
 
+  function drop_last(open, close) {
+    switch(open+" "+close) {
+      case "when ;": return true;
+      default: return false;
+    }
+  }
+
   function drop_first(open, close) {
     switch (open+" "+close) {
       case "when ->":       return true;
       case "-> end":        return true;
-      case "-> .":          return true;
-      case ". .":           return true;
       default:              return false;
     }
   }
@@ -436,6 +453,8 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
       case "if end":      return true;
       case "receive end": return true;
       case "try end":     return true;
+      case "-> catch":    return true;
+      case "-> after":    return true;
       case "-> ;":        return true;
       default:            return false;
     }
@@ -445,8 +464,9 @@ CodeMirror.defineMode("erlang", function(cmCfg) {
     startState:
       function() {
         return {tokenStack: [],
-                context: false,
-                lastToken: null};
+                in_record:  false,
+                in_string:  false,
+                in_atom:    false};
       },
 
     token: