codemirror-rails 2.2.1 → 2.3

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

@@ -0,0 +1,103 @@
+CodeMirror.defineMode('shell', function(config) {
+
+  var atoms = ['true','false'],
+      keywords = ['if','then','do','else','elif','while','until','for','in','esac','fi','fin','fil','done','exit','set','unset','export','function'],
+      commands = ['ab','awk','bash','beep','cat','cc','cd','chown','chmod','chroot','clear','cp','curl','cut','diff','echo','find','gawk','gcc','get','git','grep','kill','killall','ls','make','mkdir','openssl','mv','nc','node','npm','ping','ps','restart','rm','rmdir','sed','service','sh','shopt','shred','source','sort','sleep','ssh','start','stop','su','sudo','tee','telnet','top','touch','vi','vim','wall','wc','wget','who','write','yes','zsh'];
+
+  function tokenBase(stream, state) {
+
+    var sol = stream.sol();
+    var ch = stream.next();
+
+    if (ch === '\'' || ch === '"' || ch === '`') {
+      state.tokens.unshift(tokenString(ch));
+      return tokenize(stream, state);
+    }
+    if (ch === '#') {
+      if (sol && stream.eat('!')) {
+        stream.skipToEnd();
+        return 'meta'; // 'comment'?
+      }
+      stream.skipToEnd();
+      return 'comment';
+    }
+    if (ch === '$') {
+      state.tokens.unshift(tokenDollar);
+      return tokenize(stream, state);
+    }
+    if (ch === '+' || ch === '=') {
+      return 'operator';
+    }
+    if (ch === '-') {
+      stream.eat('-');
+      stream.eatWhile(/\w/);
+      return 'attribute';
+    }
+    if (/\d/.test(ch)) {
+      stream.eatWhile(/\d/);
+      if(!/\w/.test(stream.peek())) {
+        return 'number';
+      }
+    }
+    stream.eatWhile(/\w/);
+    var cur = stream.current();
+    if (stream.peek() === '=' && /\w+/.test(cur)) return 'def';
+    if (atoms.indexOf(cur) !== -1) return 'atom';
+    if (commands.indexOf(cur) !== -1) return 'builtin';
+    if (keywords.indexOf(cur) !== -1) return 'keyword';
+    return 'word';
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var next, end = false, escaped = false;
+      while ((next = stream.next()) != null) {
+        if (next === quote && !escaped) {
+          end = true;
+          break;
+        }
+        if (next === '$' && !escaped && quote !== '\'') {
+          escaped = true;
+          stream.backUp(1);
+          state.tokens.unshift(tokenDollar);
+          break;
+        }
+        escaped = !escaped && next === '\\';
+      }
+      if (end || !escaped) {
+        state.tokens.shift();
+      }
+      return (quote === '`' || quote === ')' ? 'quote' : 'string');
+    };
+  };
+
+  var tokenDollar = function(stream, state) {
+    if (state.tokens.length > 1) stream.eat('$');
+    var ch = stream.next(), hungry = /\w/;
+    if (ch === '{') hungry = /[^}]/;
+    if (ch === '(') {
+      state.tokens[0] = tokenString(')');
+      return tokenize(stream, state);
+    }
+    if (!/\d/.test(ch)) {
+      stream.eatWhile(hungry);
+      stream.eat('}');
+    }
+    state.tokens.shift();
+    return 'def';
+  };
+
+  function tokenize(stream, state) {
+    return (state.tokens[0] || tokenBase) (stream, state);
+  };
+
+  return {
+    startState: function() {return {tokens:[]}},
+    token: function(stream, state) {
+      if (stream.eatSpace()) return null;
+      return tokenize(stream, state);
+    }
+  };
+});
+  
+CodeMirror.defineMIME('text/x-sh', 'shell');

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

@@ -27,45 +27,45 @@ CodeMirror.defineMode('smalltalk', function(config, modeConfig) {
 
 	var next = function(stream, context, state) {
 		var token = new Token(null, context, false);
-		var char = stream.next();
+		var aChar = stream.next();
 
-		if (char === '"') {
+		if (aChar === '"') {
 			token = nextComment(stream, new Context(nextComment, context));
 
-		} else if (char === '\'') {
+		} else if (aChar === '\'') {
 			token = nextString(stream, new Context(nextString, context));
 
-		} else if (char === '#') {
+		} else if (aChar === '#') {
 			stream.eatWhile(/[^ .]/);
 			token.name = 'string-2';
 
-		} else if (char === '$') {
+		} else if (aChar === '$') {
 			stream.eatWhile(/[^ ]/);
 			token.name = 'string-2';
 
-		} else if (char === '|' && state.expectVariable) {
+		} else if (aChar === '|' && state.expectVariable) {
 			token.context = new Context(nextTemporaries, context);
 
-		} else if (/[\[\]{}()]/.test(char)) {
+		} else if (/[\[\]{}()]/.test(aChar)) {
 			token.name = 'bracket';
-			token.eos = /[\[{(]/.test(char);
+			token.eos = /[\[{(]/.test(aChar);
 
-			if (char === '[') {
+			if (aChar === '[') {
 				state.indentation++;
-			} else if (char === ']') {
+			} else if (aChar === ']') {
 				state.indentation = Math.max(0, state.indentation - 1);
 			}
 
-		} else if (specialChars.test(char)) {
+		} else if (specialChars.test(aChar)) {
 			stream.eatWhile(specialChars);
 			token.name = 'operator';
-			token.eos = char !== ';'; // ; cascaded message expression
+			token.eos = aChar !== ';'; // ; cascaded message expression
 
-		} else if (/\d/.test(char)) {
+		} else if (/\d/.test(aChar)) {
 			stream.eatWhile(/[\w\d]/);
 			token.name = 'number'
 
-		} else if (/[\w_]/.test(char)) {
+		} else if (/[\w_]/.test(aChar)) {
 			stream.eatWhile(/[\w\d_]/);
 			token.name = state.expectVariable ? (keywords.test(stream.current()) ? 'keyword' : 'variable') : null;
 
@@ -88,9 +88,9 @@ CodeMirror.defineMode('smalltalk', function(config, modeConfig) {
 
 	var nextTemporaries = function(stream, context, state) {
 		var token = new Token(null, context, false);
-		var char = stream.next();
+		var aChar = stream.next();
 
-		if (char === '|') {
+		if (aChar === '|') {
 			token.context = context.parent;
 			token.eos = true;
 

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

@@ -0,0 +1,148 @@
+CodeMirror.defineMode("smarty", function(config, parserConfig) {
+  var keyFuncs = ["debug", "extends", "function", "include", "literal"];
+  var last;
+  var regs = {
+    operatorChars: /[+\-*&%=<>!?]/,
+    validIdentifier: /[a-zA-Z0-9\_]/,
+    stringChar: /[\'\"]/
+  }
+  var leftDelim = (typeof config.mode.leftDelimiter != 'undefined') ? config.mode.leftDelimiter : "{";
+  var rightDelim = (typeof config.mode.rightDelimiter != 'undefined') ? config.mode.rightDelimiter : "}";
+  function ret(style, lst) { last = lst; return style; }
+
+
+  function tokenizer(stream, state) {
+    function chain(parser) {
+      state.tokenize = parser;
+      return parser(stream, state);
+    }
+
+    if (stream.match(leftDelim, true)) {
+      if (stream.eat("*")) {
+        return chain(inBlock("comment", "*" + rightDelim));
+      }
+      else {
+        state.tokenize = inSmarty;
+        return "tag";
+      }
+    }
+    else {
+      // I'd like to do an eatWhile() here, but I can't get it to eat only up to the rightDelim string/char
+      stream.next();
+      return null;
+    }
+  }
+
+  function inSmarty(stream, state) {
+    if (stream.match(rightDelim, true)) {
+      state.tokenize = tokenizer;
+      return ret("tag", null);
+    }
+
+    var ch = stream.next();
+    if (ch == "$") {
+      stream.eatWhile(regs.validIdentifier);
+      return ret("variable-2", "variable");
+    }
+    else if (ch == ".") {
+      return ret("operator", "property");
+    }
+    else if (regs.stringChar.test(ch)) {
+      state.tokenize = inAttribute(ch);
+      return ret("string", "string");
+    }
+    else if (regs.operatorChars.test(ch)) {
+      stream.eatWhile(regs.operatorChars);
+      return ret("operator", "operator");
+    }
+    else if (ch == "[" || ch == "]") {
+      return ret("bracket", "bracket");
+    }
+    else if (/\d/.test(ch)) {
+      stream.eatWhile(/\d/);
+      return ret("number", "number");
+    }
+    else {
+      if (state.last == "variable") {
+        if (ch == "@") {
+          stream.eatWhile(regs.validIdentifier);
+          return ret("property", "property");
+        }
+        else if (ch == "|") {
+          stream.eatWhile(regs.validIdentifier);
+          return ret("qualifier", "modifier");
+        }
+      }
+      else if (state.last == "whitespace") {
+        stream.eatWhile(regs.validIdentifier);
+        return ret("attribute", "modifier");
+      }
+      else if (state.last == "property") {
+        stream.eatWhile(regs.validIdentifier);
+        return ret("property", null);
+      }
+      else if (/\s/.test(ch)) {
+        last = "whitespace";
+        return null;
+      }
+
+      var str = "";
+      if (ch != "/") {
+    	str += ch;
+      }
+      var c = "";
+      while ((c = stream.eat(regs.validIdentifier))) {
+        str += c;
+      }
+      var i, j;
+      for (i=0, j=keyFuncs.length; i<j; i++) {
+        if (keyFuncs[i] == str) {
+          return ret("keyword", "keyword");
+        }
+      }
+      if (/\s/.test(ch)) {
+    	return null;
+      }
+      return ret("tag", "tag");
+    }
+  }
+
+  function inAttribute(quote) {
+    return function(stream, state) {
+      while (!stream.eol()) {
+        if (stream.next() == quote) {
+          state.tokenize = inSmarty;
+          break;
+        }
+      }
+      return "string";
+    };
+  }
+
+  function inBlock(style, terminator) {
+    return function(stream, state) {
+      while (!stream.eol()) {
+        if (stream.match(terminator)) {
+          state.tokenize = tokenizer;
+          break;
+        }
+        stream.next();
+      }
+      return style;
+    };
+  }
+
+  return {
+    startState: function() {
+      return { tokenize: tokenizer, mode: "smarty", last: null };
+    },
+    token: function(stream, state) {
+      var style = state.tokenize(stream, state);
+      state.last = last;
+      return style;
+    },
+    electricChars: ""
+  }
+});
+
+CodeMirror.defineMIME("text/x-smarty", "smarty");

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

@@ -82,22 +82,37 @@ CodeMirror.defineMode("stex", function(cmCfg, modeCfg)
     }
 
     function normal(source, state) {
-	if (source.match(/^\\[a-z]+/)) {
+	if (source.match(/^\\[a-zA-Z@]+/)) {
 	    var cmdName = source.current();
 	    cmdName = cmdName.substr(1, cmdName.length-1);
-	    var plug = plugins[cmdName];
-	    if (typeof(plug) == 'undefined') {
-		plug = plugins["DEFAULT"];
-	    }
+            var plug;
+            if (plugins.hasOwnProperty(cmdName)) {
+	      plug = plugins[cmdName];
+            } else {
+              plug = plugins["DEFAULT"];
+            }
 	    plug = new plug();
 	    pushCommand(state, plug);
 	    setState(state, beginParams);
 	    return plug.style;
 	}
 
+        // escape characters 
+        if (source.match(/^\\[$&%#{}_]/)) {
+          return "tag";
+        }
+
+        // white space control characters
+        if (source.match(/^\\[,;!\/]/)) {
+          return "tag";
+        }
+
 	var ch = source.next();
 	if (ch == "%") {
-	    setState(state, inCComment);
+            // special case: % at end of its own line; stay in same state
+            if (!source.eol()) {
+              setState(state, inCComment);
+            }
 	    return "comment";
 	} 
 	else if (ch=='}' || ch==']') {

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

@@ -1,18 +1,18 @@
 /***
- |''Name''|tiddlywiki.js|
- |''Description''|Enables TiddlyWikiy syntax highlighting using CodeMirror2|
- |''Author''|PMario|
- |''Version''|0.1.6|
- |''Status''|''beta''|
- |''Source''|[[GitHub|https://github.com/pmario/CodeMirror2/blob/tw-syntax/mode/tiddlywiki]]|
- |''Documentation''|http://codemirror.tiddlyspace.com/|
- |''License''|[[MIT License|http://www.opensource.org/licenses/mit-license.php]]|
- |''CoreVersion''|2.5.0|
- |''Requires''|codemirror.js|
- |''Keywords''|syntax highlighting color code mirror codemirror|
- ! Info
- CoreVersion parameter is needed for TiddlyWiki only!
- ***/
+|''Name''|tiddlywiki.js|
+|''Description''|Enables TiddlyWikiy syntax highlighting using CodeMirror|
+|''Author''|PMario|
+|''Version''|0.1.7|
+|''Status''|''stable''|
+|''Source''|[[GitHub|https://github.com/pmario/CodeMirror2/blob/tw-syntax/mode/tiddlywiki]]|
+|''Documentation''|http://codemirror.tiddlyspace.com/|
+|''License''|[[MIT License|http://www.opensource.org/licenses/mit-license.php]]|
+|''CoreVersion''|2.5.0|
+|''Requires''|codemirror.js|
+|''Keywords''|syntax highlighting color code mirror codemirror|
+! Info
+CoreVersion parameter is needed for TiddlyWiki only!
+***/
 //{{{
 CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 	var indentUnit = config.indentUnit;
@@ -47,20 +47,20 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 	}();
 
 	var isSpaceName = /[\w_\-]/i,
-		reHR = /^\-\-\-\-+$/,
+		reHR = /^\-\-\-\-+$/,					// <hr>
 		reWikiCommentStart = /^\/\*\*\*$/,		// /***
 		reWikiCommentStop = /^\*\*\*\/$/,		// ***/
 		reBlockQuote = /^<<<$/,
 
-		reJsCodeStart = /^\/\/\{\{\{$/,			// //{{{
-		reJsCodeStop = /^\/\/\}\}\}$/,			// //}}}
-		reXmlCodeStart = /^<!--\{\{\{-->$/,
-		reXmlCodeStop = /^<!--\}\}\}-->$/,
+		reJsCodeStart = /^\/\/\{\{\{$/,			// //{{{ js block start
+		reJsCodeStop = /^\/\/\}\}\}$/,			// //}}} js stop
+		reXmlCodeStart = /^<!--\{\{\{-->$/,		// xml block start
+		reXmlCodeStop = /^<!--\}\}\}-->$/,		// xml stop
 
-		reCodeBlockStart = /^\{\{\{$/,
-		reCodeBlockStop = /^\}\}\}$/,
+		reCodeBlockStart = /^\{\{\{$/,			// {{{ TW text div block start
+		reCodeBlockStop = /^\}\}\}$/,			// }}} TW text stop
 
-		reCodeStart = /\{\{\{/,
+		reCodeStart = /\{\{\{/,					// {{{ code span start
 		reUntilCodeStop = /.*?\}\}\}/;
 
 	function chain(stream, state, f) {
@@ -95,9 +95,9 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 			
 		state.block = false;	// indicates the start of a code block.
 
-		ch = stream.peek(); // don't eat, to make match simpler
+		ch = stream.peek(); 	// don't eat, to make matching simpler
 		
-		// check start of  blocks    
+		// check start of  blocks
 		if (sol && /[<\/\*{}\-]/.test(ch)) {
 			if (stream.match(reCodeBlockStart)) {
 				state.block = true;
@@ -107,16 +107,16 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 				return ret('quote', 'quote');
 			}
 			if (stream.match(reWikiCommentStart) || stream.match(reWikiCommentStop)) {
-				return ret('code', 'code');
+				return ret('code', 'comment');
 			}
 			if (stream.match(reJsCodeStart) || stream.match(reJsCodeStop) || stream.match(reXmlCodeStart) || stream.match(reXmlCodeStop)) {
-				return ret('code', 'code');
+				return ret('code', 'comment');
 			}
 			if (stream.match(reHR)) {
 				return ret('hr', 'hr');
 			}
 		} // sol
-		var ch = stream.next();
+		ch = stream.next();
 
 		if (sol && /[\/\*!#;:>|]/.test(ch)) {
 			if (ch == "!") { // tw header
@@ -125,26 +125,26 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 			}
 			if (ch == "*") { // tw list
 				stream.eatWhile('*');
-				return ret("list", "list");
+				return ret("list", "comment");
 			}
 			if (ch == "#") { // tw numbered list
 				stream.eatWhile('#');
-				return ret("list", "list");
+				return ret("list", "comment");
 			}
-			if (ch == ";") { // tw list
+			if (ch == ";") { // definition list, term
 				stream.eatWhile(';');
-				return ret("list", "list");
+				return ret("list", "comment");
 			}
-			if (ch == ":") { // tw list
+			if (ch == ":") { // definition list, description
 				stream.eatWhile(':');
-				return ret("list", "list");
+				return ret("list", "comment");
 			}
 			if (ch == ">") { // single line quote
 				stream.eatWhile(">");
 				return ret("quote", "quote");
 			}
 			if (ch == '|') {
-				return ret('table', 'table');
+				return ret('table', 'header');
 			}
 		}
 
@@ -155,13 +155,16 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 		// rudimentary html:// file:// link matching. TW knows much more ...
 		if (/[hf]/i.test(ch)) {
 			if (/[ti]/i.test(stream.peek()) && stream.match(/\b(ttps?|tp|ile):\/\/[\-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i)) {
-				return ret("link-external", "link-external");
+				return ret("link", "link");
 			}
 		}
 		// just a little string indicator, don't want to have the whole string covered
 		if (ch == '"') {
 			return ret('string', 'string');
 		}
+		if (ch == '~') {	// _no_ CamelCase indicator should be bold
+			return ret('text', 'brace');
+		}
 		if (/[\[\]]/.test(ch)) { // check for [[..]]
 			if (stream.peek() == ch) {
 				stream.next();
@@ -170,7 +173,7 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 		}
 		if (ch == "@") {	// check for space link. TODO fix @@...@@ highlighting
 			stream.eatWhile(isSpaceName);
-			return ret("link-external", "link-external");
+			return ret("link", "link");
 		}
 		if (/\d/.test(ch)) {	// numbers
 			stream.eatWhile(/\d/);
@@ -189,9 +192,15 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 				return chain(stream, state, twTokenUnderline);
 			}
 		}
-		if (ch == "-") { // tw strikethrough TODO looks ugly .. different handling see below;
+		// strikethrough and mdash handling
+		if (ch == "-") {
 			if (stream.eat("-")) {
-				return chain(stream, state, twTokenStrike);
+				// if strikethrough looks ugly, change CSS.
+				if (stream.peek() != ' ')
+					return chain(stream, state, twTokenStrike);
+				// mdash
+				if (stream.peek() == ' ')
+					return ret('text', 'brace');
 			}
 		}
 		if (ch == "'") { // tw bold
@@ -208,6 +217,7 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 			return ret(ch);
 		}
 
+		// core macro handling
 		stream.eatWhile(/[\w\$_]/);
 		var word = stream.current(),
 			known = textwords.propertyIsEnumerable(word) && textwords[word];
@@ -256,21 +266,21 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 		var ch, sb = state.block;
 		
 		if (sb && stream.current()) {
-			return ret("code", "code");
+			return ret("code", "comment");
 		}
 
 		if (!sb && stream.match(reUntilCodeStop)) {
 			state.tokenize = jsTokenBase;
-			return ret("code", "code-inline");
+			return ret("code", "comment");
 		}
 
 		if (sb && stream.sol() && stream.match(reCodeBlockStop)) {
 			state.tokenize = jsTokenBase;
-			return ret("code", "code");
+			return ret("code", "comment");
 		}
 
 		ch = stream.next();
-		return (sb) ? ret("code", "code") : ret("code", "code-inline");
+		return (sb) ? ret("code", "comment") : ret("code", "comment");
 	}
 
 	// tw em / italic
@@ -301,8 +311,8 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 		return ret("text", "underlined");
 	}
 
-	// tw strike through text looks ugly 
-	// TODO just strike through the first and last 2 chars if possible.
+	// tw strike through text looks ugly
+	// change CSS if needed
 	function twTokenStrike(stream, state) {
 		var maybeEnd = false,
 			ch, nr;
@@ -314,7 +324,7 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 			}
 			maybeEnd = (ch == "-");
 		}
-		return ret("text", "line-through");
+		return ret("text", "strikethrough");
 	}
 
 	// macro