codemirror-rails 2.24 → 2.32

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)) {
+    else if (/\d/.test(ch) || ch == "-" && stream.eat(/\d/)) {
       stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
       return ret("number", "number");
     }

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

@@ -1,26 +1,26 @@
 /*
-LESS mode - http://www.lesscss.org/
-Ported to CodeMirror by Peter Kroon
+  LESS mode - http://www.lesscss.org/
+  Ported to CodeMirror by Peter Kroon
 */
 
-CodeMirror.defineMode("css", function(config) {
+CodeMirror.defineMode("less", function(config) {
   var indentUnit = config.indentUnit, type;
   function ret(style, tp) {type = tp; return style;}
   //html5 tags
   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 +35,15 @@ CodeMirror.defineMode("css", 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
-      	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 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
         return ret("number", "unit");
-	  }
+      }
     }
     else if (ch == "!") {
       stream.match(/^\s*\w*/);
@@ -58,93 +58,93 @@ CodeMirror.defineMode("css", function(config) {
     }
     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 == "#") { // 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 == "&") {
+      stream.eatWhile(/[\w\-]/);
+      return ret(null, ch);
     }
-	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{
+      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{
       	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) {
@@ -198,10 +198,10 @@ CodeMirror.defineMode("css", function(config) {
       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;
-		}
+	  style = stream.current() 	== "when" 	? "variable" 	: 
+	    stream.string.match(/#/g) 	!= undefined 	? null 		: 
+	    /[\s,|\s\)]/.test(stream.peek()) 		? "tag" 	: null;
+	}
       }
 
       if (context == "rule" && /^[\{\};]$/.test(type))

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

@@ -1,6 +1,7 @@
 CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
-  var htmlMode = CodeMirror.getMode(cmCfg, { name: 'xml', htmlMode: true });
+  var htmlFound = CodeMirror.mimeModes.hasOwnProperty("text/html");
+  var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? "text/html" : "text/plain");
 
   var header   = 'header'
   ,   code     = 'comment'
@@ -37,6 +38,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     state.em = false;
     // Reset STRONG state
     state.strong = false;
+    if (!htmlFound && state.f == htmlBlock) {
+      state.f = inlineNormal;
+      state.block = blockNormal;
+    }
     return null;
   }
 
@@ -67,9 +72,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   function htmlBlock(stream, state) {
     var style = htmlMode.token(stream, state.htmlState);
-    if (style === 'tag' && state.htmlState.type !== 'openTag' && !state.htmlState.context) {
+    if (htmlFound && style === 'tag' && state.htmlState.type !== 'openTag' && !state.htmlState.context) {
+      state.f = inlineNormal;
+      state.block = blockNormal;
+    }
+    if (state.md_inside && stream.current().indexOf(">")!=-1) {
       state.f = inlineNormal;
       state.block = blockNormal;
+      state.htmlState.context = undefined;
     }
     return style;
   }
@@ -113,10 +123,22 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return switchInline(stream, state, linkText);
     }
     if (ch === '<' && stream.match(/^\w/, false)) {
+      var md_inside = false;
+      if (stream.string.indexOf(">")!=-1) {
+        var atts = stream.string.substring(1,stream.string.indexOf(">"));
+        if (/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(atts)) {
+          state.md_inside = true;
+        }
+      }
       stream.backUp(1);
       return switchBlock(stream, state, htmlBlock);
     }
-
+      
+    if (ch === '<' && stream.match(/^\/\w*?>/)) {
+      state.md_inside = false;
+      return "tag";
+    }
+      
     var t = getType(state);
     if (ch === '*' || ch === '_') {
       if (stream.eat(ch)) {
@@ -188,7 +210,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         f: blockNormal,
         
         block: blockNormal,
-        htmlState: htmlMode.startState(),
+        htmlState: CodeMirror.startState(htmlMode),
         indentation: 0,
         
         inline: inlineNormal,
@@ -207,13 +229,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         block: s.block,
         htmlState: CodeMirror.copyState(htmlMode, s.htmlState),
         indentation: s.indentation,
-        
+          
         inline: s.inline,
         text: s.text,
         em: s.em,
         strong: s.strong,
         header: s.header,
-        quote: s.quote
+        quote: s.quote,
+        md_inside: s.md_inside
       };
     },
 

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

@@ -15,7 +15,7 @@ CodeMirror.defineMode("mysql", function(config) {
   var ops = wordRegexp(["str", "lang", "langmatches", "datatype", "bound", "sameterm", "isiri", "isuri",
                         "isblank", "isliteral", "union", "a"]);
   var keywords = wordRegexp([
-  	('ACCESSIBLE'),('ALTER'),('AS'),('BEFORE'),('BINARY'),('BY'),('CASE'),('CHARACTER'),('COLUMN'),('CONTINUE'),('CROSS'),('CURRENT_TIMESTAMP'),('DATABASE'),('DAY_MICROSECOND'),('DEC'),('DEFAULT'),
+  ('ACCESSIBLE'),('ALTER'),('AS'),('BEFORE'),('BINARY'),('BY'),('CASE'),('CHARACTER'),('COLUMN'),('CONTINUE'),('CROSS'),('CURRENT_TIMESTAMP'),('DATABASE'),('DAY_MICROSECOND'),('DEC'),('DEFAULT'),
 	('DESC'),('DISTINCT'),('DOUBLE'),('EACH'),('ENCLOSED'),('EXIT'),('FETCH'),('FLOAT8'),('FOREIGN'),('GRANT'),('HIGH_PRIORITY'),('HOUR_SECOND'),('IN'),('INNER'),('INSERT'),('INT2'),('INT8'),
 	('INTO'),('JOIN'),('KILL'),('LEFT'),('LINEAR'),('LOCALTIME'),('LONG'),('LOOP'),('MATCH'),('MEDIUMTEXT'),('MINUTE_SECOND'),('NATURAL'),('NULL'),('OPTIMIZE'),('OR'),('OUTER'),('PRIMARY'),
 	('RANGE'),('READ_WRITE'),('REGEXP'),('REPEAT'),('RESTRICT'),('RIGHT'),('SCHEMAS'),('SENSITIVE'),('SHOW'),('SPECIFIC'),('SQLSTATE'),('SQL_CALC_FOUND_ROWS'),('STARTING'),('TERMINATED'),
@@ -57,13 +57,11 @@ CodeMirror.defineMode("mysql", function(config) {
       return null;
     }
     else if (ch == "-") {
-		ch2 = stream.next();
-		if(ch2=="-")
-		{
-			stream.skipToEnd();
-			return "comment";
-		}
-
+      var ch2 = stream.next();
+      if (ch2=="-") {
+      	stream.skipToEnd();
+      	return "comment";
+      }
     }
     else if (operatorChars.test(ch)) {
       stream.eatWhile(operatorChars);

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

@@ -0,0 +1,114 @@
+CodeMirror.defineMode('ocaml', function(config) {
+
+  var words = {
+    'true': 'atom',
+    'false': 'atom',
+    'let': 'keyword',
+    'rec': 'keyword',
+    'in': 'keyword',
+    'of': 'keyword',
+    'and': 'keyword',
+    'succ': 'keyword',
+    'if': 'keyword',
+    'then': 'keyword',
+    'else': 'keyword',
+    'for': 'keyword',
+    'to': 'keyword',
+    'while': 'keyword',
+    'do': 'keyword',
+    'done': 'keyword',
+    'fun': 'keyword',
+    'function': 'keyword',
+    'val': 'keyword',
+    'type': 'keyword',
+    'mutable': 'keyword',
+    'match': 'keyword',
+    'with': 'keyword',
+    'try': 'keyword',
+    'raise': 'keyword',
+    'begin': 'keyword',
+    'end': 'keyword',
+    'open': 'builtin',
+    'trace': 'builtin',
+    'ignore': 'builtin',
+    'exit': 'builtin',
+    'print_string': 'builtin',
+    'print_endline': 'builtin'
+  };
+
+  function tokenBase(stream, state) {
+    var sol = stream.sol();
+    var ch = stream.next();
+
+    if (ch === '"') {
+      state.tokenize = tokenString;
+      return state.tokenize(stream, state);
+    }
+    if (ch === '(') {
+      if (stream.eat('*')) {
+        state.commentLevel++;
+        state.tokenize = tokenComment;
+        return state.tokenize(stream, state);
+      }
+    }
+    if (ch === '~') {
+      stream.eatWhile(/\w/);
+      return 'variable-2';
+    }
+    if (ch === '`') {
+      stream.eatWhile(/\w/);
+      return 'quote';
+    }
+    if (/\d/.test(ch)) {
+      stream.eatWhile(/[\d]/);
+      if (stream.eat('.')) {
+        stream.eatWhile(/[\d]/);
+      }
+      return 'number';
+    }
+    if ( /[+\-*&%=<>!?|]/.test(ch)) {
+      return 'operator';
+    }
+    stream.eatWhile(/\w/);
+    var cur = stream.current();
+    return words[cur] || 'variable';
+  }
+
+  function tokenString(stream, state) {
+    var next, end = false, escaped = false;
+    while ((next = stream.next()) != null) {
+      if (next === '"' && !escaped) {
+        end = true;
+        break;
+      }
+      escaped = !escaped && next === '\\';
+    }
+    if (end && !escaped) {
+      state.tokenize = tokenBase;
+    }
+    return 'string';
+  };
+
+  function tokenComment(stream, state) {
+    var prev, next;
+    while(state.commentLevel > 0 && (next = stream.next()) != null) {
+      if (prev === '(' && next === '*') state.commentLevel++;
+      if (prev === '*' && next === ')') state.commentLevel--;
+      prev = next;
+    }
+    if (state.commentLevel <= 0) {
+      state.tokenize = tokenBase;
+    }
+    return 'comment';
+  }
+
+  return {
+    startState: function() {return {tokenize: tokenBase, commentLevel: 0}},
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      return state.tokenize(stream, state);
+    }
+  };
+});
+  
+CodeMirror.defineMIME('text/x-ocaml', 'ocaml');