Merge pull request #672 from ajaxorg/theme/update_monokai

Hella improve syntax highlighting for JS across all themes
2012-03-26 02:58:33 -07:00 · 2012-03-26 02:58:33 -07:00 · 1340569415
commit 1340569415
parent 0b3fdb469c ab7fa1a78d
31 changed files with 344 additions and 147 deletions
--- a/demo/kitchen-sink/docs/javascript.js
+++ b/demo/kitchen-sink/docs/javascript.js
@ -1,5 +1,5 @@
-function foo(items) {
+function foo  (items, nada) {
    for (var i=0; i<items.length; i++) {
-        alert(items[i] + "juhu");
+        alert(items[i] + "juhu\n");
    }	// Real Tab.
 }
--- a/lib/ace/mode/html_tokenizer_test.js
+++ b/lib/ace/mode/html_tokenizer_test.js
@ -62,7 +62,7 @@ module.exports = {
        assert.equal("keyword.operator", tokens[4].type);
        assert.equal("string", tokens[5].type);
        assert.equal("meta.tag", tokens[6].type);
-        assert.equal("keyword.definition", tokens[7].type);
+        assert.equal("storage.type", tokens[7].type);
        assert.equal("meta.tag", tokens[8].type);
        assert.equal("meta.tag.script", tokens[9].type);
        assert.equal("meta.tag", tokens[10].type);
--- a/lib/ace/mode/javascript_highlight_rules.js
+++ b/lib/ace/mode/javascript_highlight_rules.js
@ -98,6 +98,14 @@ var JavaScriptHighlightRules = function() {
        + unicode.packages.Mn + unicode.packages.Mc
        + unicode.packages.Nd
        + unicode.packages.Pc + "\\$_]*\\b";
+    
+    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
+        "u[0-9a-fA-F]{4}|" + // unicode
+        "[0-2][0-7]{0,2}|" + // oct
+        "3[0-6][0-7]?|" + // oct
+        "37[0-7]?|" + // oct 
+        "[4-7][0-7]?|" + //oct
+        ".)";
        
    // regexp must not have capturing parentheses. Use (?:) instead.
    // regexps are ordered -> the first match is used
@ -115,21 +123,13 @@ var JavaScriptHighlightRules = function() {
                regex : "\\/\\*",
                next : "comment"
            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+                token : "string",
+                regex : "'",
+                next  : "qstring"
            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : '["].*\\\\$',
-                next : "qqstring"
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : "['].*\\\\$",
-                next : "qstring"
+                token : "string",
+                regex : '"',
+                next  : "qqstring"
            }, {
                token : "constant.numeric", // hex
                regex : "0[xX][0-9a-fA-F]+\\b"
@ -137,8 +137,8 @@ var JavaScriptHighlightRules = function() {
                token : "constant.numeric", // float
                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
            }, {
-                token : ["keyword.definition", "text", "entity.name.function"],
-                regex : "(function)(\\s+)(" + identifierRe + ")"
+                token : ["storage.type", "text", "entity.name.function", "text", "paren.lparen", "variable.parameter", "paren.rparen"],
+                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
            }, {
                token : "constant.language.boolean",
                regex : "(?:true|false)\\b"
@ -146,6 +146,19 @@ var JavaScriptHighlightRules = function() {
                token : "keyword",
                regex : "(?:" + kwBeforeRe + ")\\b",
                next : "regex_allowed"
+            }, {
+                token : "support.function",
+                regex : "\\b(?:s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:op|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\\b(?=\\()"     
+            }, {
+                token : "support.function.dom",
+                regex : "\\b(?:s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\\b(?=\\()"                
+            }, {
+                token : "support.function.constant",
+                regex : "\\b(?:s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\\b"                
+            }, {
+                token : ["punctuation.operator", "support.function.firebug"],
+                regex : "(\\.)(warn|info|log|error|time|timeEnd|assert)\\b"
+                
            }, {
                token : function(value) {
                    if (globals.hasOwnProperty(value))
@ -153,7 +166,7 @@ var JavaScriptHighlightRules = function() {
                    else if (deprecated.hasOwnProperty(value))
                        return "invalid.deprecated";
                    else if (definitions.hasOwnProperty(value))
-                        return "keyword.definition";
+                        return "storage.type";
                    else if (keywords.hasOwnProperty(value))
                        return "keyword";
                    else if (buildinConstants.hasOwnProperty(value))
@ -294,24 +307,28 @@ var JavaScriptHighlightRules = function() {
        ],
        "qqstring" : [
            {
-                token : "string",
-                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
-                next : "start"
+                token : "constant.language.escape",
+                regex : escapedRe
            }, {
                token : "string",
-                merge : true,
-                regex : '.+'
+                regex : '[^"\\\\]+'
+            }, {
+                token : "string",
+                regex : '"',
+                next  : "start"
            }
        ],
        "qstring" : [
            {
-                token : "string",
-                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
-                next : "start"
+                token : "constant.language.escape",
+                regex : escapedRe
            }, {
                token : "string",
-                merge : true,
-                regex : '.+'
+                regex : "[^'\\\\]+"
+            }, {
+                token : "string",
+                regex : "'",
+                next  : "start"
            }
        ]
    };
--- a/lib/ace/mode/javascript_tokenizer_test.js
+++ b/lib/ace/mode/javascript_tokenizer_test.js
@ -63,9 +63,20 @@ module.exports = {
        assert.equal("text", tokens[1].type);
        assert.equal("keyword.operator", tokens[2].type);
        assert.equal("text", tokens[3].type);
-        assert.equal("keyword.definition", tokens[4].type);
+        assert.equal("storage.type", tokens[4].type);
    },

+    "test: tokenize 'standard' functions" : function() {
+        var line = "string.charCodeAt(23); document.getElementById('test'); console.log('Here it is');";
+
+        var tokens = this.tokenizer.getLineTokens(line, "start").tokens;
+
+        assert.equal(27, tokens.length);
+        assert.equal("support.function", tokens[2].type); // charCodeAt
+        assert.equal("support.function.dom", tokens[10].type); // getElementById
+        assert.equal("support.function.firebug", tokens[20].type); // log  
+    },
+    
    "test: tokenize doc comment" : function() {
        var line = "abc /** de */ fg";

@ -164,6 +175,20 @@ module.exports = {
        assert.equal("paren.lparen", tokens[0].type);
        assert.equal("text", tokens[1].type);
        assert.equal("comment", tokens[2].type);
+    },
+    
+    "test skipping escaped chars": function() {
+        var line = "console.log('Meh\\nNeh');"
+        var tokens = this.tokenizer.getLineTokens(line, "start").tokens;
+
+        assert.equal(11, tokens.length);
+        assert.equal("constant.language.escape", tokens[6].type);
+        
+        line = "console.log('\\u1232Feh');";
+        tokens = this.tokenizer.getLineTokens(line, "start").tokens;
+
+        assert.equal(10, tokens.length);
+        assert.equal("constant.language.escape", tokens[5].type);
    }
 };

--- a/lib/ace/theme/chrome.js
+++ b/lib/ace/theme/chrome.js
@ -79,15 +79,11 @@ exports.cssText = ".ace-chrome .ace_editor {\
  border-left: 0px;\
  border-bottom: 1px solid black;\
 }\
-        \
+\
 .ace-chrome .ace_line .ace_invisible {\
  color: rgb(191, 191, 191);\
 }\
 \
-.ace-chrome .ace_line .ace_keyword {\
-  color: blue;\
-}\
-\
 .ace-chrome .ace_line .ace_constant.ace_buildin {\
  color: rgb(88, 72, 246);\
 }\
@ -121,14 +117,14 @@ exports.cssText = ".ace-chrome .ace_editor {\
  color: rgb(109, 121, 222);\
 }\
 \
+.ace-chrome .ace_variable.ace_parameter {\
+  font-style:italic;\
+color:#FD971F;\
+}\
 .ace-chrome .ace_line .ace_keyword.ace_operator {\
  color: rgb(104, 118, 135);\
 }\
 \
-.ace-chrome .ace_line .ace_string {\
-  color: #1919a6;\
-}\
-\
 .ace-chrome .ace_line .ace_comment {\
  color: #236e24;\
 }\
@ -195,6 +191,8 @@ exports.cssText = ".ace-chrome .ace_editor {\
  border: 1px solid rgb(200, 200, 250);\
 }\
 \
+.ace-chrome .ace_storage,\
+.ace-chrome .ace_line .ace_keyword,\
 .ace-chrome .ace_meta.ace_tag {\
  color: rgb(147, 15, 128);\
 }\
@ -203,6 +201,7 @@ exports.cssText = ".ace-chrome .ace_editor {\
  color: rgb(255, 0, 0)\
 }\
 \
+.ace-chrome .ace_line .ace_string,\
 .ace-chrome .ace_entity.ace_other.ace_attribute-name{\
  color: #994409;\
 }";
--- a/lib/ace/theme/clouds.js
+++ b/lib/ace/theme/clouds.js
@ -130,6 +130,10 @@ exports.cssText = "\
  color:#C52727;\
 }\
 \
+.ace-clouds .ace_storage {\
+  color:#C52727;\
+}\
+\
 .ace-clouds .ace_string {\
  color:#5D90CD;\
 }\
@ -146,7 +150,6 @@ exports.cssText = "\
    text-decoration:underline;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
-
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/clouds_midnight.js
+++ b/lib/ace/theme/clouds_midnight.js
@ -131,6 +131,10 @@ background-color:#E92E2E;\
  color:#E92E2E;\
 }\
 \
+.ace-clouds-midnight .ace_storage {\
+  color:#E92E2E;\
+}\
+\
 .ace-clouds-midnight .ace_string {\
  color:#5D90CD;\
 }\
@ -147,7 +151,6 @@ background-color:#E92E2E;\
    text-decoration:underline;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
-
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/cobalt.js
+++ b/lib/ace/theme/cobalt.js
@ -127,6 +127,10 @@ background-color:#800F00;\
  color:#FFB054;\
 }\
 \
+.ace-cobalt .ace_storage {\
+  color:#FFEE80;\
+}\
+\
 .ace-cobalt .ace_string.ace_regexp {\
  color:#80FFC2;\
 }\
@ -161,6 +165,6 @@ background-color:#001221;\
  background-color:#130D26;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/dawn.js
+++ b/lib/ace/theme/dawn.js
@ -135,6 +135,11 @@ color:#B52A1D;\
  color:#693A17;\
 }\
 \
+.ace-dawn .ace_storage {\
+  font-style:italic;\
+color:#A71D5D;\
+}\
+\
 .ace-dawn .ace_string {\
  color:#0B6125;\
 }\
@ -164,6 +169,6 @@ color:#5A525F;\
  color:#693A17;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/dreamweaver.js
+++ b/lib/ace/theme/dreamweaver.js
@ -37,187 +37,188 @@

 define(function(require, exports, module) {
 exports.isDark = false;
-exports.cssClass = "ace-tm";
-exports.cssText = ".ace-tm .ace_editor {\
+exports.cssClass = "ace-dreamweaver";
+exports.cssText = ".ace-dreamweaver .ace_editor {\
  border: 2px solid rgb(159, 159, 159);\
 }\
 \
-.ace-tm .ace_editor.ace_focus {\
+.ace-dreamweaver .ace_editor.ace_focus {\
  border: 2px solid #327fbd;\
 }\
 \
-.ace-tm .ace_gutter {\
+.ace-dreamweaver .ace_gutter {\
  background: #e8e8e8;\
  color: #333;\
 }\
 \
-.ace-tm .ace_print_margin {\
+.ace-dreamweaver .ace_print_margin {\
  width: 1px;\
  background: #e8e8e8;\
 }\
 \
-.ace-tm .ace_fold {\
+.ace-dreamweaver .ace_fold {\
    background-color: #00F;\
 }\
 \
-.ace-tm .ace_text-layer {\
+.ace-dreamweaver .ace_text-layer {\
  cursor: text;\
 }\
 \
-.ace-tm .ace_cursor {\
+.ace-dreamweaver .ace_cursor {\
  border-left: 2px solid black;\
 }\
 \
-.ace-tm .ace_cursor.ace_overwrite {\
+.ace-dreamweaver .ace_cursor.ace_overwrite {\
  border-left: 0px;\
  border-bottom: 1px solid black;\
 }\
        \
-.ace-tm .ace_line .ace_invisible {\
+.ace-dreamweaver .ace_line .ace_invisible {\
  color: rgb(191, 191, 191);\
 }\
 \
-.ace-tm .ace_line .ace_keyword {\
+.ace-dreamweaver .ace_line .ace_storage,\
+.ace-dreamweaver .ace_line .ace_keyword {\
  color: blue;\
 }\
 \
-.ace-tm .ace_line .ace_constant.ace_buildin {\
+.ace-dreamweaver .ace_line .ace_constant.ace_buildin {\
  color: rgb(88, 72, 246);\
 }\
 \
-.ace-tm .ace_line .ace_constant.ace_language {\
+.ace-dreamweaver .ace_line .ace_constant.ace_language {\
  color: rgb(88, 92, 246);\
 }\
 \
-.ace-tm .ace_line .ace_constant.ace_library {\
+.ace-dreamweaver .ace_line .ace_constant.ace_library {\
  color: rgb(6, 150, 14);\
 }\
 \
-.ace-tm .ace_line .ace_invalid {\
+.ace-dreamweaver .ace_line .ace_invalid {\
  background-color: rgb(153, 0, 0);\
  color: white;\
 }\
 \
-.ace-tm .ace_line .ace_support.ace_function {\
+.ace-dreamweaver .ace_line .ace_support.ace_function {\
  color: rgb(60, 76, 114);\
 }\
 \
-.ace-tm .ace_line .ace_support.ace_constant {\
+.ace-dreamweaver .ace_line .ace_support.ace_constant {\
  color: rgb(6, 150, 14);\
 }\
 \
-.ace-tm .ace_line .ace_support.ace_type,\
-.ace-tm .ace_line .ace_support.ace_class {\
+.ace-dreamweaver .ace_line .ace_support.ace_type,\
+.ace-dreamweaver .ace_line .ace_support.ace_class {\
  color: #009;\
 }\
 \
-.ace-tm .ace_line .ace_support.ace_php_tag {\
+.ace-dreamweaver .ace_line .ace_support.ace_php_tag {\
  color: #f00;\
 }\
 \
-.ace-tm .ace_line .ace_keyword.ace_operator {\
+.ace-dreamweaver .ace_line .ace_keyword.ace_operator {\
  color: rgb(104, 118, 135);\
 }\
 \
-.ace-tm .ace_line .ace_string {\
+.ace-dreamweaver .ace_line .ace_string {\
  color: #00F;\
 }\
 \
-.ace-tm .ace_line .ace_comment {\
+.ace-dreamweaver .ace_line .ace_comment {\
  color: rgb(76, 136, 107);\
 }\
 \
-.ace-tm .ace_line .ace_comment.ace_doc {\
+.ace-dreamweaver .ace_line .ace_comment.ace_doc {\
  color: rgb(0, 102, 255);\
 }\
 \
-.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {\
+.ace-dreamweaver .ace_line .ace_comment.ace_doc.ace_tag {\
  color: rgb(128, 159, 191);\
 }\
 \
-.ace-tm .ace_line .ace_constant.ace_numeric {\
+.ace-dreamweaver .ace_line .ace_constant.ace_numeric {\
  color: rgb(0, 0, 205);\
 }\
 \
-.ace-tm .ace_line .ace_variable {\
+.ace-dreamweaver .ace_line .ace_variable {\
  color: #06F\
 }\
 \
-.ace-tm .ace_line .ace_xml_pe {\
+.ace-dreamweaver .ace_line .ace_xml_pe {\
  color: rgb(104, 104, 91);\
 }\
 \
-.ace-tm .ace_entity.ace_name.ace_function {\
+.ace-dreamweaver .ace_entity.ace_name.ace_function {\
  color: #00F;\
 }\
 \
-.ace-tm .ace_markup.ace_markupine {\
+.ace-dreamweaver .ace_markup.ace_markupine {\
    text-decoration:underline;\
 }\
 \
-.ace-tm .ace_markup.ace_heading {\
+.ace-dreamweaver .ace_markup.ace_heading {\
  color: rgb(12, 7, 255);\
 }\
 \
-.ace-tm .ace_markup.ace_list {\
+.ace-dreamweaver .ace_markup.ace_list {\
  color:rgb(185, 6, 144);\
 }\
 \
-.ace-tm .ace_marker-layer .ace_selection {\
+.ace-dreamweaver .ace_marker-layer .ace_selection {\
  background: rgb(181, 213, 255);\
 }\
 \
-.ace-tm .ace_marker-layer .ace_step {\
+.ace-dreamweaver .ace_marker-layer .ace_step {\
  background: rgb(252, 255, 0);\
 }\
 \
-.ace-tm .ace_marker-layer .ace_stack {\
+.ace-dreamweaver .ace_marker-layer .ace_stack {\
  background: rgb(164, 229, 101);\
 }\
 \
-.ace-tm .ace_marker-layer .ace_bracket {\
+.ace-dreamweaver .ace_marker-layer .ace_bracket {\
  margin: -1px 0 0 -1px;\
  border: 1px solid rgb(192, 192, 192);\
 }\
 \
-.ace-tm .ace_marker-layer .ace_active_line {\
+.ace-dreamweaver .ace_marker-layer .ace_active_line {\
  background: rgba(0, 0, 0, 0.07);\
 }\
 \
-.ace-tm .ace_marker-layer .ace_selected_word {\
+.ace-dreamweaver .ace_marker-layer .ace_selected_word {\
  background: rgb(250, 250, 255);\
  border: 1px solid rgb(200, 200, 250);\
 }\
 \
-.ace-tm .ace_meta.ace_tag {\
+.ace-dreamweaver .ace_meta.ace_tag {\
  color:#009;\
 }\
 \
-.ace-tm .ace_meta.ace_tag.ace_anchor {\
+.ace-dreamweaver .ace_meta.ace_tag.ace_anchor {\
  color:#060;\
 }\
 \
-.ace-tm .ace_meta.ace_tag.ace_form {\
+.ace-dreamweaver .ace_meta.ace_tag.ace_form {\
  color:#F90;\
 }\
 \
-.ace-tm .ace_meta.ace_tag.ace_image {\
+.ace-dreamweaver .ace_meta.ace_tag.ace_image {\
  color:#909;\
 }\
 \
-.ace-tm .ace_meta.ace_tag.ace_script {\
+.ace-dreamweaver .ace_meta.ace_tag.ace_script {\
  color:#900;\
 }\
 \
-.ace-tm .ace_meta.ace_tag.ace_style {\
+.ace-dreamweaver .ace_meta.ace_tag.ace_style {\
  color:#909;\
 }\
 \
-.ace-tm .ace_meta.ace_tag.ace_table {\
+.ace-dreamweaver .ace_meta.ace_tag.ace_table {\
  color:#099;\
 }\
 \
-.ace-tm .ace_string.ace_regex {\
+.ace-dreamweaver .ace_string.ace_regex {\
  color: rgb(255, 0, 0)\
 }";

--- a/lib/ace/theme/eclipse.js
+++ b/lib/ace/theme/eclipse.js
@ -70,7 +70,9 @@ exports.cssText = ".ace-eclipse .ace_editor {\
  border-left: 1px solid black;\
 }\
 \
-.ace-eclipse .ace_line .ace_keyword, .ace-eclipse .ace_line .ace_variable {\
+.ace-eclipse .ace_line .ace_storage,\
+.ace-eclipse .ace_line .ace_keyword,\
+.ace-eclipse .ace_line .ace_variable {\
  color: rgb(127, 0, 85);\
 }\
 \
--- a/lib/ace/theme/idle_fingers.js
+++ b/lib/ace/theme/idle_fingers.js
@ -123,6 +123,10 @@ background-color:#FF0000;\
  color:#B83426;\
 }\
 \
+.ace-idle-fingers .ace_variable.ace_parameter {\
+  font-style:italic;\
+}\
+\
 .ace-idle-fingers .ace_string {\
  color:#A5C261;\
 }\
@ -153,6 +157,6 @@ color:#BC9458;\
 background-color:#FFF980;   \
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/kr_theme.js
+++ b/lib/ace/theme/kr_theme.js
@ -127,6 +127,10 @@ background-color:#A41300;\
  color:#85873A;\
 }\
 \
+.ace-kr-theme .ace_storage {\
+  color:#FFEE80;\
+}\
+\
 .ace-kr-theme .ace_string.ace_regexp {\
  color:rgba(125, 255, 192, 0.65);\
 }\
@ -156,6 +160,6 @@ color:#706D5B;\
  background-color:#0F0040;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/merbivore.js
+++ b/lib/ace/theme/merbivore.js
@ -19,7 +19,7 @@
 * the Initial Developer. All Rights Reserved.
 *
 * Contributor(s):
- *      Michael Schwartz <mr.pants AT gmail DOT com>
+ *      Fabian Jakobs <fabian AT ajax DOT org>
 *
 * Alternatively, the contents of this file may be used under the terms of
 * either the GNU General Public License Version 2 or later (the "GPL"), or
@ -135,6 +135,10 @@ background-color:#990000;\
  color:#FC6F09;\
 }\
 \
+.ace-merbivore .ace_storage {\
+  color:#FC6F09;\
+}\
+\
 .ace-merbivore .ace_string {\
  color:#8DFF0A;\
 }\
@ -156,6 +160,6 @@ color:#AD2EA4;\
    text-decoration:underline;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/merbivore_soft.js
+++ b/lib/ace/theme/merbivore_soft.js
@ -19,7 +19,7 @@
 * the Initial Developer. All Rights Reserved.
 *
 * Contributor(s):
- *      Michael Schwartz <mr.pants AT gmail DOT com>
+ *      Fabian Jakobs <fabian AT ajax DOT org>
 *
 * Alternatively, the contents of this file may be used under the terms of
 * either the GNU General Public License Version 2 or later (the "GPL"), or
@ -136,6 +136,10 @@ background-color:#FE3838;\
    border-color: #E6E1DC;\
 }\
 \
+.ace-merbivore-soft .ace_storage {\
+  color:#FC803A;\
+}\
+\
 .ace-merbivore-soft .ace_string {\
  color:#8EC65F;\
 }\
@ -162,6 +166,6 @@ color:#AC4BB8;\
    text-decoration:underline;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/mono_industrial.js
+++ b/lib/ace/theme/mono_industrial.js
@ -131,6 +131,14 @@ background-color:rgba(153, 0, 0, 0.68);\
  color:#588E60;\
 }\
 \
+.ace-mono-industrial .ace_storage {\
+  color:#C23B00;\
+}\
+\
+.ace-mono-industrial .ace_variable.ace_parameter {\
+  color:#648BD2;\
+}\
+\
 .ace-mono-industrial .ace_comment {\
  color:#666C68;\
 background-color:#151C19;\
@ -156,6 +164,6 @@ background-color:#151C19;\
    text-decoration:underline;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/monokai.js
+++ b/lib/ace/theme/monokai.js
@ -132,6 +132,20 @@ background-color:#AE81FF;\
  color:#66D9EF;\
 }\
 \
+.ace-monokai .ace_storage {\
+  color:#F92672;\
+}\
+\
+.ace-monokai .ace_storage.ace_type {\
+  font-style:italic;\
+color:#66D9EF;\
+}\
+\
+.ace-monokai .ace_variable.ace_parameter {\
+  font-style:italic;\
+color:#FD971F;\
+}\
+\
 .ace-monokai .ace_string {\
  color:#E6DB74;\
 }\
@ -152,6 +166,6 @@ background-color:#AE81FF;\
    text-decoration:underline;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/pastel_on_dark.js
+++ b/lib/ace/theme/pastel_on_dark.js
@ -19,7 +19,7 @@
 * the Initial Developer. All Rights Reserved.
 *
 * Contributor(s):
- *      André Fiedler <fiedler dot andre a t gmail dot com>
+ *      Fabian Jakobs <fabian AT ajax DOT org>
 *
 * Alternatively, the contents of this file may be used under the terms of
 * either the GNU General Public License Version 2 or later (the "GPL"), or
@ -174,6 +174,6 @@ color:#D2A8A1;\
    text-decoration:underline;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/solarized_dark.js
+++ b/lib/ace/theme/solarized_dark.js
@ -122,6 +122,10 @@ exports.cssText = "\
  color:#268BD2;\
 }\
 \
+.ace-solarized-dark .ace_storage {\
+  color:#93A1A1;\
+}\
+\
 .ace-solarized-dark .ace_string {\
  color:#2AA198;\
 }\
@ -151,6 +155,6 @@ color:#657B83;\
    text-decoration:underline;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/solarized_light.js
+++ b/lib/ace/theme/solarized_light.js
@ -122,6 +122,10 @@ exports.cssText = "\
  color:#268BD2;\
 }\
 \
+.ace-solarized-light .ace_storage {\
+  color:#073642;\
+}\
+\
 .ace-solarized-light .ace_string {\
  color:#2AA198;\
 }\
@ -150,6 +154,6 @@ exports.cssText = "\
    text-decoration:underline;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/textmate.js
+++ b/lib/ace/theme/textmate.js
@ -79,6 +79,7 @@ exports.cssText = ".ace-tm .ace_editor {\
  color: rgb(191, 191, 191);\
 }\
 \
+.ace-tm .ace_line .ace_storage,\
 .ace-tm .ace_line .ace_keyword {\
  color: blue;\
 }\
--- a/lib/ace/theme/tomorrow.js
+++ b/lib/ace/theme/tomorrow.js
@ -136,6 +136,18 @@ background-color:#8959A8;\
  color:#4271AE;\
 }\
 \
+.ace-tomorrow .ace_storage {\
+  color:#8959A8;\
+}\
+\
+.ace-tomorrow .ace_storage.ace_type {\
+  color:#8959A8;\
+}\
+\
+.ace-tomorrow .ace_variable.ace_parameter {\
+  color:#F5871F;\
+}\
+\
 .ace-tomorrow .ace_string {\
  color:#718C00;\
 }\
@ -172,6 +184,6 @@ background-color:#8959A8;\
  color:#718C00;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/tomorrow_night.js
+++ b/lib/ace/theme/tomorrow_night.js
@ -136,6 +136,18 @@ background-color:#B798BF;\
  color:#81A2BE;\
 }\
 \
+.ace-tomorrow-night .ace_storage {\
+  color:#B294BB;\
+}\
+\
+.ace-tomorrow-night .ace_storage.ace_type {\
+  color:#B294BB;\
+}\
+\
+.ace-tomorrow-night .ace_variable.ace_parameter {\
+  color:#DE935F;\
+}\
+\
 .ace-tomorrow-night .ace_string {\
  color:#B5BD68;\
 }\
@ -172,6 +184,6 @@ background-color:#B798BF;\
  color:#B5BD68;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/tomorrow_night_blue.js
+++ b/lib/ace/theme/tomorrow_night_blue.js
@ -136,6 +136,18 @@ background-color:#EBBBFF;\
  color:#BBDAFF;\
 }\
 \
+.ace-tomorrow-night-blue .ace_storage {\
+  color:#EBBBFF;\
+}\
+\
+.ace-tomorrow-night-blue .ace_storage.ace_type {\
+  color:#EBBBFF;\
+}\
+\
+.ace-tomorrow-night-blue .ace_variable.ace_parameter {\
+  color:#FFC58F;\
+}\
+\
 .ace-tomorrow-night-blue .ace_string {\
  color:#D1F1A9;\
 }\
@ -172,6 +184,6 @@ background-color:#EBBBFF;\
  color:#D1F1A9;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/tomorrow_night_bright.js
+++ b/lib/ace/theme/tomorrow_night_bright.js
@ -136,6 +136,18 @@ background-color:#B798BF;\
  color:#7AA6DA;\
 }\
 \
+.ace-tomorrow-night-bright .ace_storage {\
+  color:#C397D8;\
+}\
+\
+.ace-tomorrow-night-bright .ace_storage.ace_type {\
+  color:#C397D8;\
+}\
+\
+.ace-tomorrow-night-bright .ace_variable.ace_parameter {\
+  color:#E78C45;\
+}\
+\
 .ace-tomorrow-night-bright .ace_string {\
  color:#B9CA4A;\
 }\
@ -172,6 +184,6 @@ background-color:#B798BF;\
  color:#B9CA4A;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/tomorrow_night_eighties.js
+++ b/lib/ace/theme/tomorrow_night_eighties.js
@ -136,6 +136,18 @@ background-color:#CC99CC;\
  color:#6699CC;\
 }\
 \
+.ace-tomorrow-night-eighties .ace_storage {\
+  color:#CC99CC;\
+}\
+\
+.ace-tomorrow-night-eighties .ace_storage.ace_type {\
+  color:#CC99CC;\
+}\
+\
+.ace-tomorrow-night-eighties .ace_variable.ace_parameter {\
+  color:#F99157;\
+}\
+\
 .ace-tomorrow-night-eighties .ace_string {\
  color:#99CC99;\
 }\
@ -168,6 +180,6 @@ background-color:#CC99CC;\
  color:#99CC99;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/twilight.js
+++ b/lib/ace/theme/twilight.js
@ -133,6 +133,10 @@ color:#D2A8A1;\
  color:#DAD085;\
 }\
 \
+.ace-twilight .ace_storage {\
+  color:#F9EE98;\
+}\
+\
 .ace-twilight .ace_string {\
  color:#8F9D6A;\
 }\
@ -174,6 +178,6 @@ color:#5F5A60;\
  color:#F9EE98;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/theme/vibrant_ink.js
+++ b/lib/ace/theme/vibrant_ink.js
@ -19,7 +19,7 @@
 * the Initial Developer. All Rights Reserved.
 *
 * Contributor(s):
- *      Michael Schwartz <mr.pants AT gmail DOT com>
+ *      Fabian Jakobs <fabian AT ajax DOT org>
 *
 * Alternatively, the contents of this file may be used under the terms of
 * either the GNU General Public License Version 2 or later (the "GPL"), or
@ -132,6 +132,10 @@ background-color:#000000;\
  color:#FFCC00;\
 }\
 \
+.ace-vibrant-ink .ace_variable.ace_parameter {\
+  font-style:italic;\
+}\
+\
 .ace-vibrant-ink .ace_string {\
  color:#66FF00;\
 }\
@ -157,6 +161,6 @@ color:#99CC99;\
    text-decoration:underline;\
 }";

-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass);
 });
--- a/lib/ace/token_iterator_test.js
+++ b/lib/ace/token_iterator_test.js
@ -205,7 +205,8 @@ module.exports = {
        iterator.stepForward();
        iterator.stepForward();
        iterator.stepForward();
-
+        iterator.stepForward();
+        
        assert.equal(iterator.getCurrentToken().value, "for");
        assert.equal(iterator.getCurrentTokenRow(), 1);
        assert.equal(iterator.getCurrentTokenColumn(), 4);
--- a/tool/Theme.tmpl.css
+++ b/tool/Theme.tmpl.css
@ -109,6 +109,18 @@
  %support.function%
 }

+.%cssClass% .ace_storage {
+  %storage%
+}
+
+.%cssClass% .ace_storage.ace_type {
+  %storage.type%
+}
+
+.%cssClass% .ace_variable.ace_parameter {
+  %variable.parameter%
+}
+
 .%cssClass% .ace_function.ace_buildin {
  %function.buildin%
 }
--- a/tool/tmtheme.js
+++ b/tool/tmtheme.js
@ -62,13 +62,20 @@ var supportedScopes = {
   "constant.language": "constant.language",
   "constant.library": "constant.library",
   "constant.numeric": "constant.numeric",
+   "constant.character.escape" : "constant.character.escape",
   
   "support": "support",
   "support.function": "support.function",
-
+   "support.function.dom": "support.function.dom",
+   "support.function.firebug": "support.firebug",
+   "support.function.constant": "support.function.constant",
+   
   "function": "function",
   "function.buildin": "function.buildin",
   
+   "storage": "storage",
+   "storage.type": "storage.type",
+   
   "invalid": "invalid",
   "invalid.illegal": "invalid.illegal",
   "invalid.deprecated": "invalid.deprecated",
@ -82,6 +89,7 @@ var supportedScopes = {

   "variable": "variable",
   "variable.language": "variable.language",
+   "variable.parameter": "variable.parameter",
   
   "meta": "meta",   
   "meta.tag.sgml.doctype": "xml_pe",
@ -130,6 +138,8 @@ function extractStyles(theme) {
            var scope = scopes[j];
            if (supportedScopes[scope]) {
                colors[supportedScopes[scope]] = parseStyles(element.settings);
+            } else {
+                //console.log(scope + " is not supported!");
            }
        }
    }
@ -199,7 +209,7 @@ function fillTemplate(template, replacements) {
 function createTheme(name, styles, cssTemplate, jsTemplate) {
    styles.cssClass = "ace-" + hyphenate(name);
    var css = fillTemplate(cssTemplate, styles);
-    
+ 
    css = css.replace(/[^\{\}]+{\s*}/g, "");
    return fillTemplate(jsTemplate, {
        name: name,
@ -217,25 +227,25 @@ var cssTemplate = fs.readFileSync(__dirname + "/Theme.tmpl.css", "utf8");
 var jsTemplate = fs.readFileSync(__dirname + "/Theme.tmpl.js", "utf8");

 var themes = {
-    "dawn": "Dawn",
-    "idle_fingers": "idleFingers",
-    "twilight": "Twilight",
-    "monokai": "Monokai",
-    "merbivore": "Merbivore",
-    "merbivore_soft": "Merbivore Soft",
-    "pastel_on_dark": "Pastels on Dark",
-    "cobalt": "Cobalt",
-    "mono_industrial": "monoindustrial",
    "clouds": "Clouds",
    "clouds_midnight": "Clouds Midnight",
+    "cobalt": "Cobalt",
+    "dawn": "Dawn",
+    "idle_fingers": "idleFingers",
    "kr_theme": "krTheme",
-    "solarized_light": "Solarized-light",
+    "merbivore": "Merbivore",
+    "merbivore_soft": "Merbivore Soft",
+    "mono_industrial": "monoindustrial",
+    "monokai": "Monokai",
+    "pastel_on_dark": "Pastels on Dark",
    "solarized_dark": "Solarized-dark",
+    "solarized_light": "Solarized-light",
    "tomorrow": "Tomorrow",
    "tomorrow_night": "Tomorrow-Night",
    "tomorrow_night_blue": "Tomorrow-Night-Blue",
    "tomorrow_night_bright": "Tomorrow-Night-Bright",
    "tomorrow_night_eighties": "Tomorrow-Night-Eighties",
+    "twilight": "Twilight",
    "vibrant_ink": "Vibrant Ink"
 };

@ -245,4 +255,4 @@ for (var name in themes) {

    var styles = extractStyles(parseTheme(tmTheme));
    fs.writeFileSync(__dirname + "/../lib/ace/theme/" + name + ".js", createTheme(name, styles, cssTemplate, jsTemplate));
-}
+}