codemirror-rails 3.18 → 3.19

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

@@ -3,7 +3,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
 
   if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
 
-  var indentUnit = config.indentUnit,
+  var indentUnit = config.indentUnit || config.tabSize || 2,
       hooks = parserConfig.hooks || {},
       atMediaTypes = parserConfig.atMediaTypes || {},
       atMediaFeatures = parserConfig.atMediaFeatures || {},
@@ -259,8 +259,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
       }
       else if (type == "}") {
         if (context == "interpolation") style = "operator";
-        state.stack.pop();
-        if (context == "propertyValue") state.stack.pop();
+        // Pop off end of array until { is reached
+        while(state.stack.length){
+          var removed = state.stack.pop();
+          if(removed.indexOf("{") > -1){
+            break;
+          }
+        }
       }
       else if (type == "interpolation") state.stack.push("interpolation");
       else if (type == "@media") state.stack.push("@media");
@@ -278,11 +283,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         else state.stack.push("(");
       }
       else if (type == ")") {
-        if (context == "propertyValue") {
-          // In @mediaType( without closing ; after propertyValue
-          state.stack.pop();
+        // Pop off end of array until ( is reached
+        while(state.stack.length){
+          var removed = state.stack.pop();
+          if(removed.indexOf("(") > -1){
+            break;
+          }
         }
-        state.stack.pop();
       }
       else if (type == ":" && state.lastToken == "property") state.stack.push("propertyValue");
       else if (context == "propertyValue" && type == ";") state.stack.pop();
@@ -602,6 +609,11 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
         }
         return ["variable", "variable"];
       },
+      ",": function(_stream, state) {
+        if (state.stack[state.stack.length - 1] == "propertyValue") {
+          return ["operator", ";"];
+        }
+      },
       "/": function(stream, state) {
         if (stream.eat("/")) {
           stream.skipToEnd();

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

@@ -0,0 +1,147 @@
+CodeMirror.defineMode("eiffel", function() {
+  function wordObj(words) {
+    var o = {};
+    for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true;
+    return o;
+  }
+  var keywords = wordObj([
+    'note',
+    'across',
+    'when',
+    'variant',
+    'until',
+    'unique',
+    'undefine',
+    'then',
+    'strip',
+    'select',
+    'retry',
+    'rescue',
+    'require',
+    'rename',
+    'reference',
+    'redefine',
+    'prefix',
+    'once',
+    'old',
+    'obsolete',
+    'loop',
+    'local',
+    'like',
+    'is',
+    'inspect',
+    'infix',
+    'include',
+    'if',
+    'frozen',
+    'from',
+    'external',
+    'export',
+    'ensure',
+    'end',
+    'elseif',
+    'else',
+    'do',
+    'creation',
+    'create',
+    'check',
+    'alias',
+    'agent',
+    'separate',
+    'invariant',
+    'inherit',
+    'indexing',
+    'feature',
+    'expanded',
+    'deferred',
+    'class',
+    'Void',
+    'True',
+    'Result',
+    'Precursor',
+    'False',
+    'Current',
+    'create',
+    'attached',
+    'detachable',
+    'as',
+    'and',
+    'implies',
+    'not',
+    'or'
+  ]);
+  var operators = wordObj([":=", "and then","and", "or","<<",">>"]);
+  var curPunc;
+
+  function chain(newtok, stream, state) {
+    state.tokenize.push(newtok);
+    return newtok(stream, state);
+  }
+
+  function tokenBase(stream, state) {
+    curPunc = null;
+    if (stream.eatSpace()) return null;
+    var ch = stream.next();
+    if (ch == '"'||ch == "'") {
+      return chain(readQuoted(ch, "string"), stream, state);
+    } else if (ch == "-"&&stream.eat("-")) {
+      stream.skipToEnd();
+      return "comment";
+    } else if (ch == ":"&&stream.eat("=")) {
+      return "operator";
+    } else if (/[0-9]/.test(ch)) {
+      stream.eatWhile(/[xXbBCc0-9\.]/);
+      stream.eat(/[\?\!]/);
+      return "ident";
+    } else if (/[a-zA-Z_0-9]/.test(ch)) {
+      stream.eatWhile(/[a-zA-Z_0-9]/);
+      stream.eat(/[\?\!]/);
+      return "ident";
+    } else if (/[=+\-\/*^%<>~]/.test(ch)) {
+      stream.eatWhile(/[=+\-\/*^%<>~]/);
+      return "operator";
+    } else {
+      return null;
+    }
+  }
+
+  function readQuoted(quote, style,  unescaped) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && (unescaped || !escaped)) {
+          state.tokenize.pop();
+          break;
+        }
+        escaped = !escaped && ch == "%";
+      }
+      return style;
+    };
+  }
+
+  return {
+    startState: function() {
+      return {tokenize: [tokenBase]};
+    },
+
+    token: function(stream, state) {
+      var style = state.tokenize[state.tokenize.length-1](stream, state);
+      if (style == "ident") {
+        var word = stream.current();
+        style = keywords.propertyIsEnumerable(stream.current()) ? "keyword"
+          : operators.propertyIsEnumerable(stream.current()) ? "operator"
+          : /^[A-Z][A-Z_0-9]*$/g.test(word) ? "tag"
+          : /^0[bB][0-1]+$/g.test(word) ? "number"
+          : /^0[cC][0-7]+$/g.test(word) ? "number"
+          : /^0[xX][a-fA-F0-9]+$/g.test(word) ? "number"
+          : /^([0-9]+\.[0-9]*)|([0-9]*\.[0-9]+)$/g.test(word) ? "number"
+          : /^[0-9]+$/g.test(word) ? "number"
+          : "variable";
+      }
+      return style;
+    },
+    lineComment: "--"
+  };
+});
+
+CodeMirror.defineMIME("text/x-eiffel", "eiffel");

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

@@ -75,7 +75,8 @@ CodeMirror.defineMode("gfm", function(config) {
           return "link";
         }
       }
-      if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/i)) {
+      if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/i) &&
+         stream.string.slice(stream.start - 2, stream.start) != "](") {
         // URLs
         // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls
         // And then (issue #1160) simplified to make it not crash the Chrome Regexp engine

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

@@ -0,0 +1,168 @@
+/*
+Gherkin mode - http://www.cukes.info/
+Report bugs/issues here: https://github.com/marijnh/CodeMirror/issues
+*/
+
+// Following Objs from Brackets implementation: https://github.com/tregusti/brackets-gherkin/blob/master/main.js
+//var Quotes = {
+//  SINGLE: 1,
+//  DOUBLE: 2
+//};
+
+//var regex = {
+//  keywords: /(Feature| {2}(Scenario|In order to|As|I)| {4}(Given|When|Then|And))/
+//};
+
+CodeMirror.defineMode("gherkin", function () {
+  return {
+    startState: function () {
+      return {
+        lineNumber: 0,
+        tableHeaderLine: null,
+        allowFeature: true,
+        allowBackground: false,
+        allowScenario: false,
+        allowSteps: false,
+        allowPlaceholders: false,
+        inMultilineArgument: false,
+        inMultilineString: false,
+        inMultilineTable: false
+      };
+    },
+    token: function (stream, state) {
+      if (stream.sol()) {
+        state.lineNumber++;
+      }
+      stream.eatSpace();
+
+      // INSIDE OF MULTILINE ARGUMENTS
+      if (state.inMultilineArgument) {
+
+        // STRING
+        if (state.inMultilineString) {
+          if (stream.match('"""')) {
+            state.inMultilineString = false;
+            state.inMultilineArgument = false;
+          } else {
+            stream.match(/.*/);
+          }
+          return "string";
+        }
+
+        // TABLE
+        if (state.inMultilineTable) {
+          // New table, assume first row is headers
+          if (state.tableHeaderLine === null) {
+            state.tableHeaderLine = state.lineNumber;
+          }
+
+          if (stream.match(/\|\s*/)) {
+            if (stream.eol()) {
+              state.inMultilineTable = false;
+            }
+            return "bracket";
+          } else {
+            stream.match(/[^\|]*/);
+            return state.tableHeaderLine === state.lineNumber ? "property" : "string";
+          }
+        }
+
+        // DETECT START
+        if (stream.match('"""')) {
+          // String
+          state.inMultilineString = true;
+          return "string";
+        } else if (stream.match("|")) {
+          // Table
+          state.inMultilineTable = true;
+          return "bracket";
+        } else {
+          // Or abort
+          state.inMultilineArgument = false;
+          state.tableHeaderLine = null;
+        }
+
+
+        return null;
+      }
+
+      // LINE COMMENT
+      if (stream.match(/#.*/)) {
+        return "comment";
+
+      // TAG
+      } else if (stream.match(/@\S+/)) {
+        return "def";
+
+      // FEATURE
+      } else if (state.allowFeature && stream.match(/Feature:/)) {
+        state.allowScenario = true;
+        state.allowBackground = true;
+        state.allowPlaceholders = false;
+        state.allowSteps = false;
+        return "keyword";
+
+      // BACKGROUND
+      } else if (state.allowBackground && stream.match("Background:")) {
+        state.allowPlaceholders = false;
+        state.allowSteps = true;
+        state.allowBackground = false;
+        return "keyword";
+
+      // SCENARIO OUTLINE
+      } else if (state.allowScenario && stream.match("Scenario Outline:")) {
+        state.allowPlaceholders = true;
+        state.allowSteps = true;
+        return "keyword";
+
+      // EXAMPLES
+      } else if (state.allowScenario && stream.match("Examples:")) {
+        state.allowPlaceholders = false;
+        state.allowSteps = true;
+        state.allowBackground = false;
+        state.inMultilineArgument = true;
+        return "keyword";
+
+      // SCENARIO
+      } else if (state.allowScenario && stream.match(/Scenario:/)) {
+        state.allowPlaceholders = false;
+        state.allowSteps = true;
+        state.allowBackground = false;
+        return "keyword";
+
+      // STEPS
+      } else if (state.allowSteps && stream.match(/(Given|When|Then|And|But)/)) {
+        return "keyword";
+
+      // INLINE STRING
+      } else if (!state.inMultilineArgument && stream.match(/"/)) {
+        stream.match(/.*?"/);
+        return "string";
+
+      // MULTILINE ARGUMENTS
+      } else if (state.allowSteps && stream.eat(":")) {
+        if (stream.match(/\s*$/)) {
+          state.inMultilineArgument = true;
+          return "keyword";
+        } else {
+          return null;
+        }
+
+      } else if (state.allowSteps && stream.match("<")) {
+        if (stream.match(/.*?>/)) {
+          return "property";
+        } else {
+          return null;
+        }
+
+      // Fall through
+      } else {
+        stream.eatWhile(/[^":<]/);
+      }
+
+      return null;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-feature", "gherkin");

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

@@ -32,9 +32,9 @@ CodeMirror.defineMode("less", function(config) {
         return tokenSComment(stream, state);
       } else {
         if(type == "string" || type == "(") return ret("string", "string");
-        if(state.stack[state.stack.length-1] != undefined) return ret(null, ch);
+        if(state.stack[state.stack.length-1] !== undefined) return ret(null, ch);
         stream.eatWhile(/[\a-zA-Z0-9\-_.\s]/);
-        if( /\/|\)|#/.test(stream.peek() || (stream.eatSpace() && stream.peek() == ")"))  || stream.eol() )return ret("string", "string"); // let url(/images/logo.png) without quotes return as string
+        if( /\/|\)|#/.test(stream.peek() || (stream.eatSpace() && stream.peek() === ")"))  || stream.eol() )return ret("string", "string"); // let url(/images/logo.png) without quotes return as string
       }
     } else if (ch == "!") {
       stream.match(/^\s*\w*/);
@@ -66,10 +66,11 @@ CodeMirror.defineMode("less", function(config) {
         return ret(null, ch);
       }
     } else if (ch == ".") {
-      if(type == "(" || type == "string")return ret("string", "string"); // allow url(../image.png)
+      if(type == "(")return ret("string", "string"); // allow url(../image.png)
       stream.eatWhile(/[\a-zA-Z0-9\-_]/);
-      if(stream.peek() == " ")stream.eatSpace();
-      if(stream.peek() == ")")return ret("number", "unit");//rgba(0,0,0,.25);
+      if(stream.peek() === " ")stream.eatSpace();
+      if(stream.peek() === ")" || type === ":")return ret("number", "unit");//rgba(0,0,0,.25);
+      else if(state.stack[state.stack.length-1] === "rule" && stream.peek().match(/{|,|\+|\(/) === null)return ret("number", "unit");
       return ret("tag", "tag");
     } else if (ch == "#") {
       //we don't eat white-space, we want the hex color and or id only
@@ -82,21 +83,24 @@ CodeMirror.defineMode("less", function(config) {
           //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");
+          if( /[\/<>.(){!$%^&*_\-\\?=+\|#'~`]/.test(stream.peek()) ){
+            if(type === "select-op")return ret("number", "unit"); else 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");
+          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");
+          else if(stream.eol())return ret("atom", "tag");
           //default
-                else return ret("number", "unit");
+          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");
+          return ret("atom", stream.current());
         }
       } else {//when not a valid hexvalue length
         stream.eatWhile(/[\w\\\-]/);
+        if(state.stack[state.stack.length-1] === "rule")return ret("atom", stream.current());return ret("atom", stream.current());
         return ret("atom", "tag");
       }
     } else if (ch == "&") {
@@ -104,17 +108,33 @@ CodeMirror.defineMode("less", function(config) {
       return ret(null, ch);
     } else {
       stream.eatWhile(/[\w\\\-_%.{]/);
-      if(type == "string"){
-        return ret("string", "string");
+      if(stream.current().match(/\\/) !== null){
+        if(stream.current().charAt(stream.current().length-1) === "\\"){
+          stream.eat(/\'|\"|\)|\(/);
+          while(stream.eatWhile(/[\w\\\-_%.{]/)){
+            stream.eat(/\'|\"|\)|\(/);
+          }
+          return ret("string", stream.current());
+        }
+      } //else if(type === "tag")return ret("tag", "tag");
+        else if(type == "string"){
+        if(state.stack[state.stack.length-1] === "{" && stream.peek() === ":")return ret("variable", "variable");
+        if(stream.peek() === "/")stream.eatWhile(/[\w\\\-_%.{:\/]/);
+        return ret(type, stream.current());
       } else if(stream.current().match(/(^http$|^https$)/) != null){
         stream.eatWhile(/[\w\\\-_%.{:\/]/);
+        if(stream.peek() === "/")stream.eatWhile(/[\w\\\-_%.{:\/]/);
         return ret("string", "string");
       } else if(stream.peek() == "<" || stream.peek() == ">" || stream.peek() == "+"){
+        if(type === "(" && (stream.current() === "n" || stream.current() === "-n"))return ret("string", stream.current());
         return ret("tag", "tag");
       } else if( /\(/.test(stream.peek()) ){
+        if(stream.current() === "when")return ret("variable","variable");
+        else if(state.stack[state.stack.length-1] === "@media" && stream.current() === "and")return ret("variable",stream.current());
         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.peek() == "/" && state.stack[state.stack.length-1] !== undefined){ // url(dir/center/image.png)
+        if(stream.peek() === "/")stream.eatWhile(/[\w\\\-_%.{:\/]/);
+        return ret("string", stream.current());
       } else if( stream.current().match(/\-\d|\-.\d/) ){ // match e.g.: -5px -0.4 etc... only colorize the minus sign
         //commment out these 2 comment if you want the minus sign to be parsed as null -500px
         //stream.backUp(stream.current().length-1);
@@ -129,14 +149,33 @@ CodeMirror.defineMode("less", function(config) {
         if( /[{<>.a-zA-Z\/]/.test(stream.peek())  || 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() || stream.peek() == "[" || stream.peek() == "#" || type == "tag" ){
+
         if(stream.current().substring(stream.current().length-1,stream.current().length) == "{")stream.backUp(1);
+        else if(state.stack[state.stack.length-1] === "border-color" || state.stack[state.stack.length-1] === "background-position" || state.stack[state.stack.length-1] === "font-family")return ret(null, stream.current());
+        else if(type === "tag")return ret("tag", "tag");
+        else if((type === ":" || type === "unit") && state.stack[state.stack.length-1] === "rule")return ret(null, stream.current());
+        else if(state.stack[state.stack.length-1] === "rule" && type === "tag")return ret("string", stream.current());
+        else if(state.stack[state.stack.length-1] === ";" && type === ":")return ret(null, stream.current());
+        //else if(state.stack[state.stack.length-1] === ";" || type === "")return ret("variable", stream.current());
+        else if(stream.peek() === "#" && type !== undefined && type.match(/\+|,|tag|select\-op|}|{|;/g) === null)return ret("string", stream.current());
+        else if(type === "variable")return ret(null, stream.current());
+        else if(state.stack[state.stack.length-1] === "{" && type === "comment")return ret("variable", stream.current());
+        else if(state.stack.length === 0 && (type === ";" || type === "comment"))return ret("tag", stream.current());
+        else if((state.stack[state.stack.length-1] === "{" || type === ";") && state.stack[state.stack.length-1] !== "@media{")return ret("variable", stream.current());
+        else if(state.stack[state.stack.length-2] === "{" && state.stack[state.stack.length-1] === ";")return ret("variable", stream.current());
+
         return ret("tag", "tag");
       } else if(type == "compare" || type == "a" || type == "("){
         return ret("string", "string");
       } else if(type == "|" || stream.current() == "-" || type == "["){
-        if(type == "|" )return ret("tag", "tag");
+        if(type == "|" && stream.peek().match(/\]|=|\~/) !== null)return ret("number", stream.current());
+        else if(type == "|" )return ret("tag", "tag");
+        else if(type == "["){
+          stream.eatWhile(/\w\-/);
+          return ret("number", stream.current());
+        }
         return ret(null, ch);
-      } else if(stream.peek() == ":") {
+      } else if((stream.peek() == ":") || ( stream.eatSpace() && stream.peek() == ":")) {
         stream.next();
         var t_v = stream.peek() == ":" ? true : false;
         if(!t_v){
@@ -152,11 +191,50 @@ CodeMirror.defineMode("less", function(config) {
           stream.backUp(1);
         }
         if(t_v)return ret("tag", "tag"); else return ret("variable", "variable");
-      } else if(state.stack[state.stack.length-1]  === "font-family"){
+      } else if(state.stack[state.stack.length-1]  === "font-family" || state.stack[state.stack.length-1]  === "background-position" || state.stack[state.stack.length-1]  === "border-color"){
         return ret(null, null);
       } else {
-        if(state.stack[state.stack.length-1] === "{" || type === "select-op"  || (state.stack[state.stack.length-1] === "rule" && type === ",") )return ret("tag", "tag");
-        return ret("variable", "variable");
+
+        if(state.stack[state.stack.length-1] === null && type === ":")return ret(null, stream.current());
+
+        //else if((type === ")" && state.stack[state.stack.length-1] === "rule") || (state.stack[state.stack.length-2] === "{" && state.stack[state.stack.length-1] === "rule" && type === "variable"))return ret(null, stream.current());
+
+        else if(/\^|\$/.test(stream.current()) && stream.peek().match(/\~|=/) !== null)return ret("string", "string");//att^=val
+
+        else if(type === "unit" && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
+        else if(type === "unit" && state.stack[state.stack.length-1] === ";")return ret(null, "unit");
+        else if(type === ")" && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
+        else if(type.match("@") !== null  && state.stack[state.stack.length-1] === "rule")return ret(null, "unit");
+        //else if(type === "unit" && state.stack[state.stack.length-1] === "rule")return ret(null, stream.current());
+
+        else if((type === ";" || type === "}" || type === ",") && state.stack[state.stack.length-1] === ";")return ret("tag", stream.current());
+        else if((type === ";" && stream.peek() !== undefined && stream.peek().match(/{|./) === null) || (type === ";" && stream.eatSpace() && stream.peek().match(/{|./) === null))return ret("variable", stream.current());
+        else if((type === "@media" && state.stack[state.stack.length-1] === "@media") || type === "@namespace")return ret("tag", stream.current());
+
+        else if(type === "{"  && state.stack[state.stack.length-1] === ";" && stream.peek() === "{")return ret("tag", "tag");
+        else if((type === "{" || type === ":") && state.stack[state.stack.length-1] === ";")return ret(null, stream.current());
+        else if((state.stack[state.stack.length-1] === "{" && stream.eatSpace() && stream.peek().match(/.|#/) === null) || type === "select-op"  || (state.stack[state.stack.length-1] === "rule" && type === ",") )return ret("tag", "tag");
+        else if(type === "variable" && state.stack[state.stack.length-1] === "rule")return ret("tag", "tag");
+        else if((stream.eatSpace() && stream.peek() === "{") || stream.eol() || stream.peek() === "{")return ret("tag", "tag");
+        //this one messes up indentation
+        //else if((type === "}" && stream.peek() !== ":") || (type === "}" && stream.eatSpace() && stream.peek() !== ":"))return(type, "tag");
+
+        else if(type === ")" && (stream.current() == "and" || stream.current() == "and "))return ret("variable", "variable");
+        else if(type === ")" && (stream.current() == "when" || stream.current() == "when "))return ret("variable", "variable");
+        else if(type === ")" || type === "comment" || type === "{")return ret("tag", "tag");
+        else if(stream.sol())return ret("tag", "tag");
+        else if((stream.eatSpace() && stream.peek() === "#") || stream.peek() === "#")return ret("tag", "tag");
+        else if(state.stack.length === 0)return ret("tag", "tag");
+        else if(type === ";" && stream.peek() !== undefined && stream.peek().match(/^[.|\#]/g) !== null)return ret("tag", "tag");
+
+        else if(type === ":"){stream.eatSpace();return ret(null, stream.current());}
+
+        else if(stream.current() === "and " || stream.current() === "and")return ret("variable", stream.current());
+        else if(type === ";" && state.stack[state.stack.length-1] === "{")return ret("variable", stream.current());
+
+        else if(state.stack[state.stack.length-1] === "rule")return ret(null, stream.current());
+
+        return ret("tag", stream.current());
       }
     }
   }
@@ -234,20 +312,30 @@ CodeMirror.defineMode("less", function(config) {
       else if (type == "}") state.stack.pop();
       else if (type == "@media") state.stack.push("@media");
       else if (stream.current() === "font-family") state.stack[state.stack.length-1] = "font-family";
+      else if (stream.current() === "background-position") state.stack[state.stack.length-1] = "background-position";
+      else if (stream.current() === "border-color") state.stack[state.stack.length-1] = "border-color";
       else if (context == "{" && type != "comment" && type !== "tag") state.stack.push("rule");
       else if (stream.peek() === ":" && stream.current().match(/@|#/) === null) style = type;
+      if(type === ";" && (state.stack[state.stack.length-1] == "font-family" || state.stack[state.stack.length-1] == "background-position" || state.stack[state.stack.length-1] == "border-color"))state.stack[state.stack.length-1] = stream.current();
+      else if(type === "tag" && stream.peek() === ")" && stream.current().match(/\:/) === null){type = null; style = null;}
+      // ????
+      else if((type === "variable" && stream.peek() === ")") || (type === "variable" && stream.eatSpace() && stream.peek() === ")"))return ret(null,stream.current());
       return style;
     },
 
     indent: function(state, textAfter) {
       var n = state.stack.length;
-
       if (/^\}/.test(textAfter))
-        n -= state.stack[state.stack.length-1] == "rule" ? 2 : 1;
+        n -= state.stack[state.stack.length-1] === "rule" ? 2 : 1;
+      else if (state.stack[state.stack.length-2] === "{")
+        n -= state.stack[state.stack.length-1] === "rule" ? 1 : 0;
       return state.baseIndent + n * indentUnit;
     },
 
-    electricChars: "}"
+    electricChars: "}",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: "//"
   };
 });