From a0038069b89d5a9775355d94eb8055f208788d16 Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Thu, 22 Mar 2012 11:04:06 +0100 Subject: [PATCH] Include storage.type for JS definitions; fix various themes --- lib/ace/mode/javascript_highlight_rules.js | 4 +- lib/ace/mode/javascript_tokenizer_test.js | 2 +- lib/ace/theme/chrome.js | 13 +-- lib/ace/theme/clouds.js | 9 ++- lib/ace/theme/clouds_midnight.js | 9 ++- lib/ace/theme/cobalt.js | 8 +- lib/ace/theme/dawn.js | 9 ++- lib/ace/theme/dreamweaver.js | 93 +++++++++++----------- lib/ace/theme/eclipse.js | 4 +- lib/ace/theme/idle_fingers.js | 4 +- lib/ace/theme/kr_theme.js | 8 +- lib/ace/theme/merbivore.js | 10 ++- lib/ace/theme/merbivore_soft.js | 10 ++- lib/ace/theme/mono_industrial.js | 8 +- lib/ace/theme/monokai.js | 13 ++- lib/ace/theme/pastel_on_dark.js | 6 +- lib/ace/theme/solarized_dark.js | 8 +- lib/ace/theme/solarized_light.js | 8 +- lib/ace/theme/textmate.js | 1 + lib/ace/theme/tomorrow.js | 12 ++- lib/ace/theme/tomorrow_night.js | 12 ++- lib/ace/theme/tomorrow_night_blue.js | 12 ++- lib/ace/theme/tomorrow_night_bright.js | 12 ++- lib/ace/theme/tomorrow_night_eighties.js | 12 ++- lib/ace/theme/twilight.js | 8 +- lib/ace/theme/vibrant_ink.js | 6 +- tool/Theme.tmpl.css | 8 ++ tool/tmtheme.js | 3 + 28 files changed, 207 insertions(+), 105 deletions(-) diff --git a/lib/ace/mode/javascript_highlight_rules.js b/lib/ace/mode/javascript_highlight_rules.js index 36c3aaee..c822e4c8 100644 --- a/lib/ace/mode/javascript_highlight_rules.js +++ b/lib/ace/mode/javascript_highlight_rules.js @@ -137,7 +137,7 @@ var JavaScriptHighlightRules = function() { token : "constant.numeric", // float regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b" }, { - token : ["keyword.definition", "text", "entity.name.function"], + token : ["storage.type", "text", "entity.name.function"], regex : "(function)(\\s+)(" + identifierRe + ")" }, { token : "constant.language.boolean", @@ -153,7 +153,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)) diff --git a/lib/ace/mode/javascript_tokenizer_test.js b/lib/ace/mode/javascript_tokenizer_test.js index 28e19458..b6d7e75e 100644 --- a/lib/ace/mode/javascript_tokenizer_test.js +++ b/lib/ace/mode/javascript_tokenizer_test.js @@ -63,7 +63,7 @@ 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 doc comment" : function() { diff --git a/lib/ace/theme/chrome.js b/lib/ace/theme/chrome.js index 0ea77417..10996e0d 100644 --- 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);\ }\ @@ -125,10 +121,6 @@ exports.cssText = ".ace-chrome .ace_editor {\ color: rgb(104, 118, 135);\ }\ \ -.ace-chrome .ace_line .ace_string {\ - color: #1919a6;\ -}\ -\ .ace-chrome .ace_line .ace_comment {\ color: #236e24;\ }\ @@ -195,6 +187,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 +197,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;\ }"; diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js index 04136f18..a447c4df 100644 --- 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); }); diff --git a/lib/ace/theme/clouds_midnight.js b/lib/ace/theme/clouds_midnight.js index ff415309..fbc65d88 100644 --- 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); }); diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js index 303964b0..aa7e6f66 100644 --- 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); }); diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js index ed714e03..9e6c2cad 100644 --- 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); }); diff --git a/lib/ace/theme/dreamweaver.js b/lib/ace/theme/dreamweaver.js index eba74244..cfa8c467 100644 --- 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)\ }"; diff --git a/lib/ace/theme/eclipse.js b/lib/ace/theme/eclipse.js index 3c4f05e7..ed2376a0 100644 --- 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);\ }\ \ diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js index 675235d4..44cf693b 100644 --- a/lib/ace/theme/idle_fingers.js +++ b/lib/ace/theme/idle_fingers.js @@ -153,6 +153,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); }); diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js index 1c9b9277..3306fe69 100644 --- 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); }); diff --git a/lib/ace/theme/merbivore.js b/lib/ace/theme/merbivore.js index 352db138..b73eddf4 100644 --- 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 + * Fabian Jakobs * * 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); }); diff --git a/lib/ace/theme/merbivore_soft.js b/lib/ace/theme/merbivore_soft.js index 8e5c4832..b380dacd 100644 --- 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 + * Fabian Jakobs * * 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); }); diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js index 5d0cbe3b..5213152e 100644 --- a/lib/ace/theme/mono_industrial.js +++ b/lib/ace/theme/mono_industrial.js @@ -131,6 +131,10 @@ background-color:rgba(153, 0, 0, 0.68);\ color:#588E60;\ }\ \ +.ace-mono-industrial .ace_storage {\ + color:#C23B00;\ +}\ +\ .ace-mono-industrial .ace_comment {\ color:#666C68;\ background-color:#151C19;\ @@ -156,6 +160,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); }); diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js index 48e66407..f7823c6d 100644 --- a/lib/ace/theme/monokai.js +++ b/lib/ace/theme/monokai.js @@ -132,6 +132,15 @@ 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_string {\ color:#E6DB74;\ }\ @@ -152,6 +161,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); }); diff --git a/lib/ace/theme/pastel_on_dark.js b/lib/ace/theme/pastel_on_dark.js index a2ca4f56..0e909d70 100644 --- 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 + * Fabian Jakobs * * 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); }); diff --git a/lib/ace/theme/solarized_dark.js b/lib/ace/theme/solarized_dark.js index 1491e765..6ca07423 100644 --- 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); }); diff --git a/lib/ace/theme/solarized_light.js b/lib/ace/theme/solarized_light.js index 2d7e7e49..479f8849 100644 --- 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); }); diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js index 5011b636..8bc8d7c4 100644 --- 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;\ }\ diff --git a/lib/ace/theme/tomorrow.js b/lib/ace/theme/tomorrow.js index d918da27..821c83cc 100644 --- a/lib/ace/theme/tomorrow.js +++ b/lib/ace/theme/tomorrow.js @@ -136,6 +136,14 @@ background-color:#8959A8;\ color:#4271AE;\ }\ \ +.ace-tomorrow .ace_storage {\ + color:#8959A8;\ +}\ +\ +.ace-tomorrow .ace_storage.ace_type {\ + color:#8959A8;\ +}\ +\ .ace-tomorrow .ace_string {\ color:#718C00;\ }\ @@ -172,6 +180,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); }); diff --git a/lib/ace/theme/tomorrow_night.js b/lib/ace/theme/tomorrow_night.js index ebbaf242..1bbba0da 100644 --- a/lib/ace/theme/tomorrow_night.js +++ b/lib/ace/theme/tomorrow_night.js @@ -136,6 +136,14 @@ 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_string {\ color:#B5BD68;\ }\ @@ -172,6 +180,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); }); diff --git a/lib/ace/theme/tomorrow_night_blue.js b/lib/ace/theme/tomorrow_night_blue.js index 11d15b69..b399f8e3 100644 --- a/lib/ace/theme/tomorrow_night_blue.js +++ b/lib/ace/theme/tomorrow_night_blue.js @@ -136,6 +136,14 @@ 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_string {\ color:#D1F1A9;\ }\ @@ -172,6 +180,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); }); diff --git a/lib/ace/theme/tomorrow_night_bright.js b/lib/ace/theme/tomorrow_night_bright.js index 3a9ae844..7b7eccd1 100644 --- a/lib/ace/theme/tomorrow_night_bright.js +++ b/lib/ace/theme/tomorrow_night_bright.js @@ -136,6 +136,14 @@ 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_string {\ color:#B9CA4A;\ }\ @@ -172,6 +180,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); }); diff --git a/lib/ace/theme/tomorrow_night_eighties.js b/lib/ace/theme/tomorrow_night_eighties.js index c491e64e..359b17d5 100644 --- a/lib/ace/theme/tomorrow_night_eighties.js +++ b/lib/ace/theme/tomorrow_night_eighties.js @@ -136,6 +136,14 @@ 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_string {\ color:#99CC99;\ }\ @@ -168,6 +176,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); }); diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js index 4bd7b00d..e7c8ffe4 100644 --- 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); }); diff --git a/lib/ace/theme/vibrant_ink.js b/lib/ace/theme/vibrant_ink.js index 20633f7a..eba1614a 100644 --- 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 + * Fabian Jakobs * * 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 @@ -157,6 +157,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); }); diff --git a/tool/Theme.tmpl.css b/tool/Theme.tmpl.css index 99af91b7..64b34ec3 100644 --- a/tool/Theme.tmpl.css +++ b/tool/Theme.tmpl.css @@ -109,6 +109,14 @@ %support.function% } +.%cssClass% .ace_storage { + %storage% +} + +.%cssClass% .ace_storage.ace_type { + %storage.type% +} + .%cssClass% .ace_function.ace_buildin { %function.buildin% } diff --git a/tool/tmtheme.js b/tool/tmtheme.js index e8040b59..c87e5652 100644 --- a/tool/tmtheme.js +++ b/tool/tmtheme.js @@ -69,6 +69,9 @@ var supportedScopes = { "function": "function", "function.buildin": "function.buildin", + "storage": "storage", + "storage.type": "storage.type", + "invalid": "invalid", "invalid.illegal": "invalid.illegal", "invalid.deprecated": "invalid.deprecated",