jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #672 from ajaxorg/theme/update_monokai

Browse source 
Hella improve syntax highlighting for JS across all themes
This commit is contained in:
cloud9Deploy 2012-03-26 02:58:33 -07:00
commit 1340569415
31 changed files with 344 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tool/Theme.tmpl.css
View file

@ -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%
}

36
tool/tmtheme.js
View file

@ -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));
}
}