codemirror-rails 2.3 → 2.21

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

@@ -21,7 +21,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     }
     if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
       curPunc = ch;
-      return null;
+      return null
     }
     if (/\d/.test(ch)) {
       stream.eatWhile(/[\w\.]/);
@@ -59,7 +59,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         escaped = !escaped && next == "\\";
       }
       if (end || !(escaped || multiLineStrings))
-        state.tokenize = null;
+        state.tokenize = tokenBase;
       return "string";
     };
   }
@@ -68,7 +68,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     var maybeEnd = false, ch;
     while (ch = stream.next()) {
       if (ch == "/" && maybeEnd) {
-        state.tokenize = null;
+        state.tokenize = tokenBase;
         break;
       }
       maybeEnd = (ch == "*");
@@ -231,41 +231,4 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       }
     }
   });
-  CodeMirror.defineMIME("text/x-scala", {
-    name: "clike",
-    keywords: words(
-      
-      /* scala */
-      "abstract case catch class def do else extends false final finally for forSome if " +
-      "implicit import lazy match new null object override package private protected return " +
-      "sealed super this throw trait try trye type val var while with yield _ : = => <- <: " +
-      "<% >: # @ " +
-                    
-      /* package scala */
-      "assert assume require print println printf readLine readBoolean readByte readShort " +
-      "readChar readInt readLong readFloat readDouble " +
-      
-      "AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either " +
-      "Enumeration Equiv Error Exception Fractional Function IndexedSeq Integral Iterable " +
-      "Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering " +
-      "Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder " +
-      "StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector :: #:: " +
-      
-      /* package java.lang */            
-      "Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable " +
-      "Compiler Double Exception Float Integer Long Math Number Object Package Pair Process " +
-      "Runtime Runnable SecurityManager Short StackTraceElement StrictMath String " +
-      "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"
-      
-      
-    ),
-    blockKeywords: words("catch class do else finally for forSome if match switch try while"),
-    atoms: words("true false null"),
-    hooks: {
-      "@": function(stream, state) {
-        stream.eatWhile(/[\w\$_]/);
-        return "meta";
-      }
-    }
-  });
 }());

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

@@ -4,7 +4,7 @@
  */
 CodeMirror.defineMode("clojure", function (config, mode) {
     var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", TAG = "tag",
-        ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword";
+        ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD="keyword";
     var INDENT_WORD_SKIP = 2, KEYWORDS_SKIP = 1;
 
     function makeKeywords(str) {
@@ -14,25 +14,26 @@ CodeMirror.defineMode("clojure", function (config, mode) {
     }
 
     var atoms = makeKeywords("true false nil");
-    
+
     var keywords = makeKeywords(
-      "defn defn- def def- defonce defmulti defmethod defmacro defstruct deftype defprotocol defrecord defproject deftest slice defalias defhinted defmacro- defn-memo defnk defnk defonce- defunbound defunbound- defvar defvar- let letfn do case cond condp for loop recur when when-not when-let when-first if if-let if-not . .. -> ->> doto and or dosync doseq dotimes dorun doall load import unimport ns in-ns refer try catch finally throw with-open with-local-vars binding gen-class gen-and-load-class gen-and-save-class handler-case handle");
+        // Control structures
+        "defn defn- def def- defonce defmulti defmethod defmacro defstruct deftype defprotocol defrecord deftest slice defalias defhinted defmacro- defn-memo defnk defnk defonce- defunbound defunbound- defvar defvar- let letfn do case cond condp for loop recur when when-not when-let when-first if if-let if-not . .. -> ->> doto and or dosync doseq dotimes dorun doall load import unimport ns in-ns refer try catch finally throw with-open with-local-vars binding gen-class gen-and-load-class gen-and-save-class handler-case handle" +
 
-    var builtins = makeKeywords(
+        // Built-ins
         "* *1 *2 *3 *agent* *allow-unresolved-vars* *assert *clojure-version* *command-line-args* *compile-files* *compile-path* *e *err* *file* *flush-on-newline* *in* *macro-meta* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *use-context-classloader* *warn-on-reflection* + - / < <= = == > >= accessor aclone agent agent-errors aget alength alias all-ns alter alter-meta! alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* butlast byte byte-array bytes case cast char char-array char-escape-string char-name-string char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec decimal? declare definline defmacro defmethod defmulti defn defn- defonce defstruct delay delay? deliver deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall doc dorun doseq dosync dotimes doto double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq eval even? every? extend extend-protocol extend-type extends? extenders false? ffirst file-seq filter find find-doc find-ns find-var first float float-array float? floats flush fn fn? fnext for force format future future-call future-cancel future-cancelled? future-done? future? gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator hash hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc init-proxy instance? int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array make-hierarchy map map? mapcat max max-key memfn memoize merge merge-with meta method-sig methods min min-key mod name namespace neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext num number? odd? or parents partial partition pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers primitives-classnames print print-ctor print-doc print-dup print-method print-namespace-doc print-simple print-special-doc print-str printf println println-str prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot rand rand-int range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string reify reduce ref ref-history-count ref-max-history ref-min-history ref-set refer refer-clojure release-pending-sends rem remove remove-method remove-ns repeat repeatedly replace replicate require reset! reset-meta! resolve rest resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off seq seq? seque sequence sequential? set set-validator! set? short short-array shorts shutdown-agents slurp some sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-form-anchor special-symbol? split-at split-with str stream? string? struct struct-map subs subseq subvec supers swap! symbol symbol? sync syntax-symbol-anchor take take-last take-nth take-while test the-ns time to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-dec unchecked-divide unchecked-inc unchecked-multiply unchecked-negate unchecked-remainder unchecked-subtract underive unquote unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context with-local-vars with-meta with-open with-out-str with-precision xml-seq");
 
     var indentKeys = makeKeywords(
         // Built-ins
-        "ns fn def defn defmethod bound-fn if if-not case condp when while when-not when-first do future comment doto locking proxy with-open with-precision reify deftype defrecord defprotocol extend extend-protocol extend-type try catch " +
+        "ns fn def defn defmethod bound-fn if if-not case condp when while when-not when-first do future comment doto locking proxy with-open with-precision reify deftype defrecord defprotocol extend extend-protocol extend-type try catch" +
 
         // Binding forms
-        "let letfn binding loop for doseq dotimes when-let if-let " +
+        "let letfn binding loop for doseq dotimes when-let if-let" +
 
         // Data structures
-        "defstruct struct-map assoc " +
+        "defstruct struct-map assoc" +
 
         // clojure.test
-        "testing deftest " +
+        "testing deftest" +
 
         // contrib
         "handler-case handle dotrace deftrace");
@@ -102,7 +103,7 @@ CodeMirror.defineMode("clojure", function (config, mode) {
             return {
                 indentStack: null,
                 indentation: 0,
-                mode: false
+                mode: false,
             };
         },
 
@@ -153,11 +154,12 @@ CodeMirror.defineMode("clojure", function (config, mode) {
                         (;something else, bracket, etc.
                         */
 
-                        if (ch == "(") while ((letter = stream.eat(tests.keyword_char)) != null) {
+                        while ((letter = stream.eat(tests.keyword_char)) != null) {
                             keyWord += letter;
                         }
 
                         if (keyWord.length > 0 && indentKeys.propertyIsEnumerable(keyWord)) { // indent-word
+
                             pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
                         } else { // non-indent word
                             // we continue eating the spaces
@@ -180,15 +182,13 @@ CodeMirror.defineMode("clojure", function (config, mode) {
                         }
                     } else if ( ch == ":" ) {
                         stream.eatWhile(tests.lang_keyword);
-                        return ATOM;
+                        return TAG;
                     } else {
                         stream.eatWhile(tests.basic);
 
                         if (keywords && keywords.propertyIsEnumerable(stream.current())) {
-                            returnType = KEYWORD;
-                        } else if (builtins && builtins.propertyIsEnumerable(stream.current())) {
                             returnType = BUILTIN;
-                        } else if (atoms && atoms.propertyIsEnumerable(stream.current())) {
+                        } else if ( atoms && atoms.propertyIsEnumerable(stream.current()) ) {
                             returnType = ATOM;
                         } else returnType = null;
                     }

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

@@ -60,12 +60,6 @@ CodeMirror.defineMode('coffeescript', function(conf) {
 
         var ch = stream.peek();
 
-        // Handle docco title comment (single line)
-        if (stream.match("####")) {
-            stream.skipToEnd();
-            return 'comment';
-        }
-
         // Handle multi line comments
         if (stream.match("###")) {
             state.tokenize = longComment;

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

@@ -92,7 +92,7 @@ CodeMirror.defineMode("css", function(config) {
       var style = state.tokenize(stream, state);
 
       var context = state.stack[state.stack.length-1];
-      if (type == "hash" && context != "rule") style = "string-2";
+      if (type == "hash" && context == "rule") style = "atom";
       else if (style == "variable") {
         if (context == "rule") style = "number";
         else if (!context || context == "@media{") style = "tag";

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

@@ -1,30 +1,11 @@
 CodeMirror.defineMode("diff", function() {
-
-  var TOKEN_NAMES = {
-    '+': 'tag',
-    '-': 'string',
-    '@': 'meta'
-  };
-
   return {
     token: function(stream) {
-      var tw_pos = stream.string.search(/[\t ]+?$/);
-
-      if (!stream.sol() || tw_pos === 0) {
-        stream.skipToEnd();
-        return ("error " + (
-          TOKEN_NAMES[stream.string.charAt(0)] || '')).replace(/ $/, '');
-      }
-
-      var token_name = TOKEN_NAMES[stream.peek()] || stream.skipToEnd();
-
-      if (tw_pos === -1) {
-        stream.skipToEnd();
-      } else {
-        stream.pos = tw_pos;
-      }
-
-      return token_name;
+      var ch = stream.next();
+      stream.skipToEnd();
+      if (ch == "+") return "plus";
+      if (ch == "-") return "minus";
+      if (ch == "@") return "rangeinfo";
     }
   };
 });

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

@@ -8,7 +8,7 @@ CodeMirror.defineMode("gfm", function(config, parserConfig) {
     "c++": "text/x-c++src",
     java: "text/x-java",
     csharp: "text/x-csharp",
-    "c#": "text/x-csharp"
+    "c#": "text/x-csharp",
   };
 
   // make this lazy so that we don't need to load GFM last
@@ -69,7 +69,7 @@ CodeMirror.defineMode("gfm", function(config, parserConfig) {
   function handleText(stream, mdState) {
     var match;
     if (stream.match(/^\w+:\/\/\S+/)) {
-      return 'link';
+      return 'linkhref';
     }
     if (stream.match(/^[^\[*\\<>` _][^\[*\\<>` ]*[^\[*\\<>` _]/)) {
       return mdMode.getType(mdState);
@@ -102,43 +102,7 @@ CodeMirror.defineMode("gfm", function(config, parserConfig) {
     },
 
     token: function(stream, state) {
-        /* Parse GFM double bracket links */
-        if ((ch = stream.peek()) != undefined && ch == '[') {
-            stream.next(); // Advance the stream
-
-            /* Only handle double bracket links */
-            if ((ch = stream.peek()) == undefined || ch != '[') {
-                stream.backUp(1);
-                return state.token(stream, state);
-            } 
-
-            while ((ch = stream.next()) != undefined && ch != ']') {}
-
-            if (ch == ']' && (ch = stream.next()) != undefined && ch == ']') 
-                return 'link';
-
-            /* If we did not find the second ']' */
-            stream.backUp(1);
-        }
-
-        /* Match GFM latex formulas, as well as latex formulas within '$' */
-        if (stream.match(/^\$[^\$]+\$/)) {
-            return "string";
-        }
-
-        if (stream.match(/^\\\((.*?)\\\)/)) {
-            return "string";
-        }
-
-        if (stream.match(/^\$\$[^\$]+\$\$/)) {
-            return "string";
-        }
-        
-        if (stream.match(/^\\\[(.*?)\\\]/)) {
-            return "string";
-        }
-
-        return state.token(stream, state);
+      return state.token(stream, state);
     }
   }
-}, "markdown");
+});

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

@@ -4,20 +4,20 @@ CodeMirror.defineMode("go", function(config, parserConfig) {
   var keywords = {
     "break":true, "case":true, "chan":true, "const":true, "continue":true,
     "default":true, "defer":true, "else":true, "fallthrough":true, "for":true,
-    "func":true, "go":true, "goto":true, "if":true, "import":true,
-    "interface":true, "map":true, "package":true, "range":true, "return":true,
-    "select":true, "struct":true, "switch":true, "type":true, "var":true,
-    "bool":true, "byte":true, "complex64":true, "complex128":true,
-    "float32":true, "float64":true, "int8":true, "int16":true, "int32":true,
-    "int64":true, "string":true, "uint8":true, "uint16":true, "uint32":true,
-    "uint64":true, "int":true, "uint":true, "uintptr":true
+    "func":true, "go":true, "goto":true, "if":true, "import":true, "interface":true,
+    "map":true, "package":true, "range":true, "return":true, "select":true,
+    "struct":true, "switch":true, "type":true, "var":true, "bool":true, "byte":true,
+    "complex64":true, "complex128":true, "float32":true, "float64":true,
+    "int8":true, "int16":true, "int32":true, "int64":true, "string":true,
+    "uint8":true, "uint16":true, "uint32":true, "uint64":true, "int":true,
+    "uint":true, "uintptr":true
   };
 
   var atoms = {
     "true":true, "false":true, "iota":true, "nil":true, "append":true,
-    "cap":true, "close":true, "complex":true, "copy":true, "imag":true,
-    "len":true, "make":true, "new":true, "panic":true, "print":true,
-    "println":true, "real":true, "recover":true
+    "cap":true, "close":true, "complex":true, "copy":true, "imag":true, "len":true,
+    "make":true, "new":true, "panic":true, "print":true, "println":true,
+    "real":true, "recover":true
   };
 
   var blockKeywords = {
@@ -66,7 +66,7 @@ CodeMirror.defineMode("go", function(config, parserConfig) {
     stream.eatWhile(/[\w\$_]/);
     var cur = stream.current();
     if (keywords.propertyIsEnumerable(cur)) {
-      if (cur == "case" || cur == "default") curPunc = "case";
+      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
       return "keyword";
     }
     if (atoms.propertyIsEnumerable(cur)) return "atom";
@@ -133,7 +133,6 @@ CodeMirror.defineMode("go", function(config, parserConfig) {
         if (ctx.align == null) ctx.align = false;
         state.indented = stream.indentation();
         state.startOfLine = true;
-        if (ctx.type == "case") ctx.type = "}";
       }
       if (stream.eatSpace()) return null;
       curPunc = null;
@@ -144,9 +143,14 @@ CodeMirror.defineMode("go", function(config, parserConfig) {
       if (curPunc == "{") pushContext(state, stream.column(), "}");
       else if (curPunc == "[") pushContext(state, stream.column(), "]");
       else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "case") ctx.type = "case"
-      else if (curPunc == "}" && ctx.type == "}") ctx = popContext(state);
+      else if (curPunc == "}") {
+        while (ctx.type == "statement") ctx = popContext(state);
+        if (ctx.type == "}") ctx = popContext(state);
+        while (ctx.type == "statement") ctx = popContext(state);
+      }
       else if (curPunc == ctx.type) popContext(state);
+      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
+        pushContext(state, stream.column(), "statement");
       state.startOfLine = false;
       return style;
     },
@@ -154,16 +158,14 @@ CodeMirror.defineMode("go", function(config, parserConfig) {
     indent: function(state, textAfter) {
       if (state.tokenize != tokenBase && state.tokenize != null) return 0;
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
-      if (ctx.type == "case" && /^(?:case|default)\b/.test(textAfter)) {
-        state.context.type = "}";
-        return ctx.indented;
-      }
+      if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
       var closing = firstChar == ctx.type;
-      if (ctx.align) return ctx.column + (closing ? 0 : 1);
+      if (ctx.type == "statement") return ctx.indented;
+      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
       else return ctx.indented + (closing ? 0 : indentUnit);
     },
 
-    electricChars: "{}:"
+    electricChars: "{}"
   };
 });
 

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

@@ -61,7 +61,7 @@ CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
 
     electricChars: "/{}:"
   }
-}, "htmlmixed");
+});
 
 CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingModeSpec:"javascript"});
 CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});

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

@@ -28,7 +28,7 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
   function javascript(stream, state) {
     if (stream.match(/^<\/\s*script\s*>/i, false)) {
       state.token = html;
-      state.localState = null;
+      state.curState = null;
       state.mode = "html";
       return html(stream, state);
     }
@@ -73,13 +73,11 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
     },
 
     compareStates: function(a, b) {
-      if (a.mode != b.mode) return false;
-      if (a.localState) return CodeMirror.Pass;
       return htmlMode.compareStates(a.htmlState, b.htmlState);
     },
 
     electricChars: "/{}:"
   }
-}, "xml", "javascript", "css");
+});
 
 CodeMirror.defineMIME("text/html", "htmlmixed");

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

@@ -54,7 +54,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       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");
     }
@@ -243,7 +243,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     
   function maybeoperator(type, value) {
     if (type == "operator" && /\+\+|--/.test(value)) return cont(maybeoperator);
-    if (type == "operator" || type == ":") return cont(expression);
+    if (type == "operator") return cont(expression);
     if (type == ";") return;
     if (type == "(") return cont(pushlex(")"), commasep(expression, ")"), poplex, maybeoperator);
     if (type == ".") return cont(property, maybeoperator);
@@ -319,8 +319,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         kwAllowed: true,
         cc: [],
         lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
-        localVars: parserConfig.localVars,
-        context: parserConfig.localVars && {vars: parserConfig.localVars},
+        localVars: null,
+        context: null,
         indented: 0
       };
     },
@@ -334,16 +334,15 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       if (stream.eatSpace()) return null;
       var style = state.tokenize(stream, state);
       if (type == "comment") return style;
-      state.reAllowed = !!(type == "operator" || type == "keyword c" || type.match(/^[\[{}\(,;:]$/));
+      state.reAllowed = type == "operator" || type == "keyword c" || type.match(/^[\[{}\(,;:]$/);
       state.kwAllowed = type != '.';
       return parseJS(state, style, type, content, stream);
     },
 
     indent: function(state, textAfter) {
       if (state.tokenize != jsTokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
-      if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
-      var type = lexical.type, closing = firstChar == type;
+      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical,
+          type = lexical.type, closing = firstChar == type;
       if (type == "vardef") return lexical.indented + 4;
       else if (type == "form" && firstChar == "{") return lexical.indented;
       else if (type == "stat" || type == "form") return lexical.indented + indentUnit;

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

@@ -1,8 +1,3 @@
-/*
-LESS mode - http://www.lesscss.org/
-Ported to CodeMirror by Peter Kroon
-*/
-
 CodeMirror.defineMode("less", function(config) {
   var indentUnit = config.indentUnit, type;
   function ret(style, tp) {type = tp; return style;}
@@ -10,17 +5,17 @@ CodeMirror.defineMode("less", function(config) {
   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"];
   
   function inTagsArray(val){
-	  for(var i=0; i<tags.length; i++){
-		  if(val === tags[i]){
-			  return true;
-		  }
-	  }
+    for(var i=0; i<tags.length; i++){
+      if(val === tags[i]){
+	return true;
+      }
+    }
   }
 
   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);
@@ -35,15 +30,14 @@ CodeMirror.defineMode("less", function(config) {
       state.tokenize = tokenString(ch);
       return state.tokenize(stream, state);
     }
-	else if (ch == "/") { // lesscss e.g.: .png will not be parsed as a class
-	  if(stream.eat("/")){
-		state.tokenize = tokenSComment
+    else if (ch == "/") { // lesscss e.g.: .png will not be parsed as a class
+      if(stream.eat("/")){
+	state.tokenize = tokenSComment
       	return tokenSComment(stream, state);
-	  }else{
-	    stream.eatWhile(/[\a-zA-Z0-9\-_.\s]/);
-		if(/\/|\)|#/.test(stream.peek() || stream.eol() || (stream.eatSpace() && stream.peek() == ")")))return ret("string", "string");//let url(/images/logo.png) without quotes return as string
+      }else{
+	stream.eatWhile(/[\a-zA-Z0-9\-_.]/);
         return ret("number", "unit");
-	  }
+      }
     }
     else if (ch == "!") {
       stream.match(/^\s*\w*/);
@@ -53,98 +47,64 @@ CodeMirror.defineMode("less", function(config) {
       stream.eatWhile(/[\w.%]/);
       return ret("number", "unit");
     }
-    else if (/[,+<>*\/]/.test(ch)) {//removed . dot character original was [,.+>*\/]
+    else if (/[,+>*\/]/.test(ch)) {//removed . dot character original was [,.+>*\/]
       return ret(null, "select-op");
     }
     else if (/[;{}:\[\]()]/.test(ch)) { //added () char for lesscss original was [;{}:\[\]]
       if(ch == ":"){
-		stream.eatWhile(/[active|hover|link|visited]/);
-		if( stream.current().match(/active|hover|link|visited/)){
-		  return ret("tag", "tag");
-		}else{
-		  return ret(null, ch);	
-		}
-	  }else{
-  	    return ret(null, ch);
-	  }
+	stream.eatWhile(/[active|hover|link|visited]/);
+	if( stream.current().match(/[active|hover|link|visited]/)){
+	  return ret("tag", "tag");
+	}else{
+	  return ret(null, ch);	
+	}
+      }else{
+  	return ret(null, ch);
+      }
     }
-	else if (ch == ".") { // lesscss
-	  stream.eatWhile(/[\a-zA-Z0-9\-_]/);
+    else if (ch == ".") { // lesscss
+      stream.eatWhile(/[\a-zA-Z0-9\-_]/);
       return ret("tag", "tag");
     }
-	else if (ch == "#") { // lesscss
-	  //we don't eat white-space, we want the hex color and or id only
-	  stream.eatWhile(/[A-Za-z0-9]/);
-	  //check if there is a proper hex color length e.g. #eee || #eeeEEE
-	  if(stream.current().length ===4 || stream.current().length ===7){
-		  if(stream.current().match(/[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}/,false) != null){//is there a valid hex color value present in the current stream
-		  	//when not a valid hex value, parse as id
-			if(stream.current().substring(1) != stream.current().match(/[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}/,false))return ret("atom", "tag");
-			//eat white-space
-			stream.eatSpace();
-			//when hex value declaration doesn't end with [;,] but is does with a slash/cc comment treat it as an id, just like the other hex values that don't end with[;,]
-			if( /[\/<>.(){!$%^&*_\-\\?=+\|#'~`]/.test(stream.peek()) )return ret("atom", "tag");
-			//#time { color: #aaa }
-			else if(stream.peek() == "}" )return ret("number", "unit");
-			//we have a valid hex color value, parse as id whenever an element/class is defined after the hex(id) value e.g. #eee aaa || #eee .aaa
-			else if( /[a-zA-Z\\]/.test(stream.peek()) )return ret("atom", "tag");
-			//when a hex value is on the end of a line, parse as id
-			else if(stream.eol())return ret("atom", "tag");
-			//default
-			else return ret("number", "unit");
-		  }else{//when not a valid hexvalue in the current stream e.g. #footer
-			stream.eatWhile(/[\w\\\-]/);
-			return ret("atom", "tag"); 
-		  }
-	  }else{
-		stream.eatWhile(/[\w\\\-]/);		
-		return ret("atom", "tag");
-	  }
-    }
-	else if (ch == "&") {
+    else if (ch == "#") { // lesscss
+      stream.match(/([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/);
+      if(stream.current().length >1){
+	if(stream.current().match(/([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/) != null){
+	  return ret("number", "unit");
+	}else{
 	  stream.eatWhile(/[\w\-]/);
-	  return ret(null, ch);
+	  return ret("atom", "tag"); 
 	}
+      }else{
+	stream.eatWhile(/[\w\-]/);
+	return ret("atom", "tag");
+      }
+    }
+    else if (ch == "&") {
+      stream.eatWhile(/[\w\-]/);
+      return ret(null, ch);
+    }
     else {
-      stream.eatWhile(/[\w\\\-_%.{]/);
-	  if(stream.current().match(/http|https/) != null){
-		stream.eatWhile(/[\w\\\-_%.{:\/]/);
-		return ret("string", "string");
-	  }else if(stream.peek() == "<" || stream.peek() == ">"){
-		return ret("tag", "tag");
-	  }else if( stream.peek().match(/\(/) != null ){// lessc
-		return ret(null, ch);
-	  }else if (stream.peek() == "/" && state.stack[state.stack.length-1] != undefined){ // url(dir/center/image.png)
-	  	return ret("string", "string");
-	  }else if( stream.current().match(/\-\d|\-.\d/) ){ // lesscss match e.g.: -5px -0.4 etc... only colorize the minus sign
-		//stream.backUp(stream.current().length-1); //commment out these 2 comment if you want the minus sign to be parsed as null -500px
-	  	//return ret(null, ch);
-		return ret("number", "unit");
-	  }else if( inTagsArray(stream.current()) ){ // lesscss 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);
-			return ret("tag", "tag");
-		}//end if
-		if( (stream.eatSpace() && stream.peek().match(/[{<>.a-zA-Z]/) != null)  || stream.eol() )return ret("tag", "tag");//e.g. button.icon-plus
-		return ret("string", "string");//let url(/images/logo.png) without quotes return as string
-	  }else if( stream.eol() ){
-		  if(stream.current().substring(stream.current().length-1,stream.current().length) == "{")stream.backUp(1);
-		  return ret("tag", "tag");
-	  }else{
+      stream.eatWhile(/[\w\\\-_.%{]/);
+      if( stream.eat("(") ){ // lesscss
+	return ret(null, ch);
+      }else if( stream.current().match(/\-\d|\-.\d/) ){ // lesscss match e.g.: -5px -0.4 etc...
+	return ret("number", "unit");
+      }else if( inTagsArray(stream.current()) ){ // lesscss match html tags
+	return ret("tag", "tag");
+      }else{
       	return ret("variable", "variable");
-	  }
+      }
     }
     
   }
 
   function tokenSComment(stream, state) {// SComment = Slash comment
     stream.skipToEnd();
-	state.tokenize = tokenBase;
+    state.tokenize = tokenBase;
     return ret("comment", "comment");
   }
-    
+  
   function tokenCComment(stream, state) {
     var maybeEnd = false, ch;
     while ((ch = stream.next()) != null) {
@@ -183,7 +143,7 @@ CodeMirror.defineMode("less", function(config) {
   }
 
   return {
-    startState: function(base) { 
+    startState: function(base) {
       return {tokenize: tokenBase,
               baseIndent: base || 0,
               stack: []};
@@ -197,11 +157,7 @@ CodeMirror.defineMode("less", function(config) {
       if (type == "hash" && context == "rule") style = "atom";
       else if (style == "variable") {
         if (context == "rule") style = null; //"tag"
-        else if (!context || context == "@media{"){ 
-			style = stream.current() 	== "when" 	? "variable" 	: 
-			stream.string.match(/#/g) 	!= undefined 	? null 		: 
-			/[\s,|\s\)]/.test(stream.peek()) 		? "tag" 	: null;
-		}
+        else if (!context || context == "@media{") style = "tag";
       }
 
       if (context == "rule" && /^[\{\};]$/.test(type))
@@ -227,6 +183,4 @@ CodeMirror.defineMode("less", function(config) {
   };
 });
 
-CodeMirror.defineMIME("text/x-less", "less");
-if (!CodeMirror.mimeModes.hasOwnProperty("text/css"))
-  CodeMirror.defineMIME("text/css", "less");
+CodeMirror.defineMIME("text/less", "less");