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

Fix C highlighting, update ObjC, fix themes, add UUID

Browse source
This commit is contained in:
Garen Torikian 2012-09-09 02:56:49 -07:00 • committed by nightwing
commit 779c00eace
49 changed files with 367 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

69
demo/kitchen-sink/docs/objectivec.m
View file

@ -8,4 +8,71 @@
}
@end
@"blah" @"asd\d" @"\fawn\\"
@"blah\8" @"a\222sd\d" @"\faw\"\? \' \4 n\\" @"\56"
@"\xSF42"
-(NSDecimalNumber*)addCount:(id)addObject{
return [count decimalNumberByAdding:addObject.count];
}
NS_DURING NS_HANDLER NS_ENDHANDLER
@try {
if (argc > 1) {
@throw [NSException exceptionWithName:@"Throwing a test exception" reason:@"Testing the @throw directive." userInfo:nil];
}
}
@catch (id theException) {
NSLog(@"%@", theException);
result = 1 ;
}
@finally {
NSLog(@"This always happens.");
result += 2 ;
}
@synchronized(lock) {
NSLog(@"Hello World");
}
struct { @defs( NSObject) }
char *enc1 = @encode(int);
IBOutlet|IBAction|BOOL|SEL|id|unichar|IMP|Class
@class @protocol
@public
// instance variables
@package
// instance variables
@protected
// instance variables
@private
// instance variables
YES NO Nil nil
NSApp()
NSRectToCGRect (Protocol ProtocolFromString:"NSTableViewDelegate"))
[SPPoint pointFromCGPoint:self.position]
NSRoundDownToMultipleOfPageSize
#import <stdio.h>
int main( int argc, const char *argv[] ) {
printf( "hello world\n" );
return 0;
}
NSChangeSpelling
@selector(lowercaseString) @selector(uppercaseString:)

52
lib/ace/mode/c_cpp_highlight_rules.js
View file

@ -37,27 +37,42 @@ var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
var c_cppHighlightRules = function() {
var keywords = (
"and|double|not_eq|throw|and_eq|dynamic_cast|operator|true|" +
"asm|else|or|try|auto|enum|or_eq|typedef|bitand|explicit|private|" +
"typeid|bitor|extern|protected|typename|bool|false|public|union|" +
"break|float|register|unsigned|case|fro|reinterpret-cast|using|catch|" +
"friend|return|virtual|char|goto|short|void|class|if|signed|volatile|" +
"compl|inline|sizeof|wchar_t|const|int|static|while|const-cast|long|" +
"static_cast|xor|continue|mutable|struct|xor_eq|default|namespace|" +
"switch|delete|new|template|do|not|this|for"
var keywordControls = (
"break|case|continue|default|do|else|for|goto|if|_Pragma|" +
"return|switch|while|catch|operator|try|throw|using"
);
var storageType = (
"asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|" +
"_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void" +
"class|wchar_t|template"
);
var buildinConstants = (
"NULL"
var storageModifiers = (
"const|extern|register|restrict|static|volatile|inline|private:|" +
"protected:|public:|friend|explicit|virtual|export|mutable|typename"
);
var keywordOperators = (
"and|and_eq|bitand|bitor|compl|not|not_eq|or|or_eq|typeid|xor|xor_eq" +
"const_cast|dynamic_cast|reinterpret_cast|static_cast|sizeof|namespace"
);
var builtinConstants = (
"NULL|true|false|TRUE|FALSE"
);
var keywordMapper = this.createKeywordMapper({
"keyword.control" : keywordControls,
"storage.type" : storageType,
"storage.modifier" : storageModifiers,
"keyword.operator" : keywordOperators,
"variable.language": "this",
"keyword": keywords,
"constant.language": buildinConstants
"constant.language": builtinConstants
}, "identifier");
var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\d\\$_\u00a1-\uffff]*\\b";
// regexp must not have capturing parentheses. Use (?:) instead.
// regexps are ordered -> the first match is used
@ -101,7 +116,16 @@ var c_cppHighlightRules = function() {
}, {
token : "keyword", // pre-compiler directivs
regex : "(?:#include|#pragma|#line|#define|#undef|#ifdef|#else|#elif|#endif|#ifndef)"
}, {
}, {
token : "support.function.C99.c",
regex : "\\s*\\bhypot(?:f|l)?|s(?:scanf|ystem|nprintf|ca(?:nf|lb(?:n(?:f|l)?|ln(?:f|l)?))|i(?:n(?:h(?:f|l)?|f|l)?|gn(?:al|bit))|tr(?:s(?:tr|pn)|nc(?:py|at|mp)|c(?:spn|hr|oll|py|at|mp)|to(?:imax|d|u(?:l(?:l)?|max)|k|f|l(?:d|l)?)|error|pbrk|ftime|len|rchr|xfrm)|printf|et(?:jmp|vbuf|locale|buf)|qrt(?:f|l)?|w(?:scanf|printf)|rand)|n(?:e(?:arbyint(?:f|l)?|xt(?:toward(?:f|l)?|after(?:f|l)?))|an(?:f|l)?)|c(?:s(?:in(?:h(?:f|l)?|f|l)?|qrt(?:f|l)?)|cos(?:h(?:f)?|f|l)?|imag(?:f|l)?|t(?:ime|an(?:h(?:f|l)?|f|l)?)|o(?:s(?:h(?:f|l)?|f|l)?|nj(?:f|l)?|pysign(?:f|l)?)|p(?:ow(?:f|l)?|roj(?:f|l)?)|e(?:il(?:f|l)?|xp(?:f|l)?)|l(?:o(?:ck|g(?:f|l)?)|earerr)|a(?:sin(?:h(?:f|l)?|f|l)?|cos(?:h(?:f|l)?|f|l)?|tan(?:h(?:f|l)?|f|l)?|lloc|rg(?:f|l)?|bs(?:f|l)?)|real(?:f|l)?|brt(?:f|l)?)|t(?:ime|o(?:upper|lower)|an(?:h(?:f|l)?|f|l)?|runc(?:f|l)?|gamma(?:f|l)?|mp(?:nam|file))|i(?:s(?:space|n(?:ormal|an)|cntrl|inf|digit|u(?:nordered|pper)|p(?:unct|rint)|finite|w(?:space|c(?:ntrl|type)|digit|upper|p(?:unct|rint)|lower|al(?:num|pha)|graph|xdigit|blank)|l(?:ower|ess(?:equal|greater)?)|al(?:num|pha)|gr(?:eater(?:equal)?|aph)|xdigit|blank)|logb(?:f|l)?|max(?:div|abs))|di(?:v|fftime)|_Exit|unget(?:c|wc)|p(?:ow(?:f|l)?|ut(?:s|c(?:har)?|wc(?:har)?)|error|rintf)|e(?:rf(?:c(?:f|l)?|f|l)?|x(?:it|p(?:2(?:f|l)?|f|l|m1(?:f|l)?)?))|v(?:s(?:scanf|nprintf|canf|printf|w(?:scanf|printf))|printf|f(?:scanf|printf|w(?:scanf|printf))|w(?:scanf|printf)|a_(?:start|copy|end|arg))|qsort|f(?:s(?:canf|e(?:tpos|ek))|close|tell|open|dim(?:f|l)?|p(?:classify|ut(?:s|c|w(?:s|c))|rintf)|e(?:holdexcept|set(?:e(?:nv|xceptflag)|round)|clearexcept|testexcept|of|updateenv|r(?:aiseexcept|ror)|get(?:e(?:nv|xceptflag)|round))|flush|w(?:scanf|ide|printf|rite)|loor(?:f|l)?|abs(?:f|l)?|get(?:s|c|pos|w(?:s|c))|re(?:open|e|ad|xp(?:f|l)?)|m(?:in(?:f|l)?|od(?:f|l)?|a(?:f|l|x(?:f|l)?)?))|l(?:d(?:iv|exp(?:f|l)?)|o(?:ngjmp|cal(?:time|econv)|g(?:1(?:p(?:f|l)?|0(?:f|l)?)|2(?:f|l)?|f|l|b(?:f|l)?)?)|abs|l(?:div|abs|r(?:int(?:f|l)?|ound(?:f|l)?))|r(?:int(?:f|l)?|ound(?:f|l)?)|gamma(?:f|l)?)|w(?:scanf|c(?:s(?:s(?:tr|pn)|nc(?:py|at|mp)|c(?:spn|hr|oll|py|at|mp)|to(?:imax|d|u(?:l(?:l)?|max)|k|f|l(?:d|l)?|mbs)|pbrk|ftime|len|r(?:chr|tombs)|xfrm)|to(?:b|mb)|rtomb)|printf|mem(?:set|c(?:hr|py|mp)|move))|a(?:s(?:sert|ctime|in(?:h(?:f|l)?|f|l)?)|cos(?:h(?:f|l)?|f|l)?|t(?:o(?:i|f|l(?:l)?)|exit|an(?:h(?:f|l)?|2(?:f|l)?|f|l)?)|b(?:s|ort))|g(?:et(?:s|c(?:har)?|env|wc(?:har)?)|mtime)|r(?:int(?:f|l)?|ound(?:f|l)?|e(?:name|alloc|wind|m(?:ove|quo(?:f|l)?|ainder(?:f|l)?))|a(?:nd|ise))|b(?:search|towc)|m(?:odf(?:f|l)?|em(?:set|c(?:hr|py|mp)|move)|ktime|alloc|b(?:s(?:init|towcs|rtowcs)|towc|len|r(?:towc|len)))\\b"
}, {
// function myFunc(arg) { }
token : [
"text", "entity.name.function", "text", "paren.lparen"
],
regex : "(\\s+)(" + identifierRe + ")(\\s*)(\\()"
}, {
token : keywordMapper,
regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
}, {

4
lib/ace/mode/jade_highlight_rules.js
View file

@ -33,6 +33,10 @@
*
* ***** END LICENSE BLOCK ***** */
/*
THIS FILE WAS AUTOGENERATED BY mode_highlight_rules.tmpl.js (UUID: C5B73B98-5F2A-42E3-9F0E-028A74A9FE4B)
*/
define(function(require, exports, module) {
"use strict";

295
lib/ace/mode/objectivec_highlight_rules.js
View file

File diff suppressed because one or more lines are too long

2
lib/ace/theme/clouds.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: 47536290-6FC1-4B09-A08F-B219909E1A69) */
.ace-clouds .ace_editor {
border: 2px solid rgb(159, 159, 159);

2
lib/ace/theme/clouds.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = false;

2
lib/ace/theme/clouds_midnight.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: E5304455-0AC7-4082-8E62-5FD1B3313EEC) */
.ace-clouds-midnight .ace_editor {
border: 2px solid rgb(159, 159, 159);

2
lib/ace/theme/clouds_midnight.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

6
lib/ace/theme/cobalt.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: 06CD1FB2-A00A-4F8C-97B2-60E131980454) */
.ace-cobalt .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -77,10 +77,6 @@
color:#FF628C;
}
.ace-cobalt .ace_constant.ace_character.ace_escape, {
color:#FF628C;
}
.ace-cobalt .ace_invalid {
color:#F8F8F8;
background-color:#800F00;

2
lib/ace/theme/cobalt.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

6
lib/ace/theme/dawn.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: E7E82498-F9EA-49A6-A0D8-12327EA46B01) */
.ace-dawn .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -77,10 +77,6 @@
color:#811F24;
}
.ace-dawn .ace_constant.ace_character.ace_escape, {
color:#811F24;
}
.ace-dawn .ace_invalid.ace_illegal {
text-decoration:underline;
font-style:italic;

2
lib/ace/theme/dawn.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = false;

6
lib/ace/theme/idle_fingers.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: 95BEF169-A2E5-4041-A84A-AAFC1DD61558) */
.ace-idle-fingers .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -77,10 +77,6 @@
color:#6C99BB;
}
.ace-idle-fingers .ace_constant.ace_character.ace_escape, {
color:#6C99BB;
}
.ace-idle-fingers .ace_invalid {
color:#FFFFFF;
background-color:#FF0000;

2
lib/ace/theme/idle_fingers.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

6
lib/ace/theme/kr_theme.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: 87F051F7-B6FB-408C-96F9-467B66C14E9F) */
.ace-kr-theme .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -77,10 +77,6 @@
color:rgba(210, 117, 24, 0.76);
}
.ace-kr-theme .ace_constant.ace_character.ace_escape, {
color:rgba(210, 117, 24, 0.76);
}
.ace-kr-theme .ace_invalid {
color:#F8F8F8;
background-color:#A41300;

2
lib/ace/theme/kr_theme.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

10
lib/ace/theme/merbivore.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: 2ABC646D-06F3-48A5-94E9-18EF34474C97) */
.ace-merbivore .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -77,8 +77,8 @@
color:#1EDAFB;
}
.ace-merbivore .ace_constant.ace_character.ace_escape, {
color:#1EDAFB;
.ace-merbivore .ace_constant.ace_character.ace_escape {
color:#519F50;
}
.ace-merbivore .ace_constant.ace_language {
@ -111,6 +111,10 @@ background-color:#990000;
color:#FC6F09;
}
.ace-merbivore .ace_support.ace_type {
color:#1EDAFB;
}
.ace-merbivore .ace_storage {
color:#FC6F09;
}

2
lib/ace/theme/merbivore.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

10
lib/ace/theme/merbivore_soft.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: B3517E4B-5243-46CF-AB04-9AE7B41DE3F2) */
.ace-merbivore-soft .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -77,8 +77,8 @@
color:#68C1D8;
}
.ace-merbivore-soft .ace_constant.ace_character.ace_escape, {
color:#68C1D8;
.ace-merbivore-soft .ace_constant.ace_character.ace_escape {
color:#B3E5B4;
}
.ace-merbivore-soft .ace_constant.ace_language {
@ -112,6 +112,10 @@ background-color:#FE3838;
border-color: #E6E1DC;
}
.ace-merbivore-soft .ace_support.ace_type {
color:#68C1D8;
}
.ace-merbivore-soft .ace_storage {
color:#FC803A;
}

2
lib/ace/theme/merbivore_soft.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

14
lib/ace/theme/mono_industrial.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: EEA328BA-54E5-49DC-81F3-1F25BF8AF163) */
.ace-mono-industrial .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -81,10 +81,6 @@
color:#E98800;
}
.ace-mono-industrial .ace_constant.ace_character.ace_escape, {
color:#E98800;
}
.ace-mono-industrial .ace_constant.ace_numeric {
color:#E98800;
}
@ -107,6 +103,14 @@ background-color:rgba(153, 0, 0, 0.68);
color:#588E60;
}
.ace-mono-industrial .ace_support.ace_type {
color:#5778B6;
}
.ace-mono-industrial .ace_support.ace_class {
color:#5778B6;
}
.ace-mono-industrial .ace_storage {
color:#C23B00;
}

2
lib/ace/theme/mono_industrial.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

14
lib/ace/theme/monokai.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: D8D5E82E-3D5B-46B5-B38E-8C841C21347D) */
.ace-monokai .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -73,7 +73,7 @@
color:#F92672;
}
.ace-monokai .ace_constant.ace_character, {
.ace-monokai .ace_constant.ace_character {
color:#AE81FF;
}
@ -112,6 +112,16 @@ background-color:#AE81FF;
color:#66D9EF;
}
.ace-monokai .ace_support.ace_type {
font-style:italic;
color:#66D9EF;
}
.ace-monokai .ace_support.ace_class {
font-style:italic;
color:#66D9EF;
}
.ace-monokai .ace_storage {
color:#F92672;
}

2
lib/ace/theme/monokai.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

8
lib/ace/theme/pastel_on_dark.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: 343011CC-B7DF-11D9-B5C6-000D93C8BE28) */
.ace-pastel-on-dark .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -81,14 +81,10 @@
color:#4FB7C5;
}
.ace-pastel-on-dark .ace_constant.ace_character, {
.ace-pastel-on-dark .ace_constant.ace_character {
color:#AFA472;
}
.ace-pastel-on-dark .ace_constant.ace_character.ace_escape, {
color:#4FB7C5;
}
.ace-pastel-on-dark .ace_constant.ace_language {
color:#DE8E30;
}

2
lib/ace/theme/pastel_on_dark.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

12
lib/ace/theme/solarized_dark.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: F930B0BF-AA03-4232-A30F-CEF749FF8E72) */
.ace-solarized-dark .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -73,7 +73,7 @@
color:#859900;
}
.ace-solarized-dark .ace_constant.ace_character, {
.ace-solarized-dark .ace_constant.ace_character {
color:#CB4B16;
}
@ -98,6 +98,14 @@
color:#268BD2;
}
.ace-solarized-dark .ace_support.ace_type {
color:#859900;
}
.ace-solarized-dark .ace_support.ace_class {
color:#859900;
}
.ace-solarized-dark .ace_storage {
color:#93A1A1;
}

2
lib/ace/theme/solarized_dark.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

12
lib/ace/theme/solarized_light.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: 38E819D9-AE02-452F-9231-ECC3B204AFD7) */
.ace-solarized-light .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -73,7 +73,7 @@
color:#859900;
}
.ace-solarized-light .ace_constant.ace_character, {
.ace-solarized-light .ace_constant.ace_character {
color:#CB4B16;
}
@ -98,6 +98,14 @@
color:#268BD2;
}
.ace-solarized-light .ace_support.ace_type {
color:#859900;
}
.ace-solarized-light .ace_support.ace_class {
color:#859900;
}
.ace-solarized-light .ace_storage {
color:#073642;
}

2
lib/ace/theme/solarized_light.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = false;

12
lib/ace/theme/tomorrow.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: 82CCD69C-F1B1-4529-B39E-780F91F07604) */
.ace-tomorrow .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -77,7 +77,7 @@
color:#3E999F;
}
.ace-tomorrow .ace_constant.ace_character, {
.ace-tomorrow .ace_constant.ace_character {
color:#F5871F;
}
@ -116,6 +116,14 @@ background-color:#8959A8;
color:#4271AE;
}
.ace-tomorrow .ace_support.ace_type {
color:#C99E00;
}
.ace-tomorrow .ace_support.ace_class {
color:#C99E00;
}
.ace-tomorrow .ace_storage {
color:#8959A8;
}

2
lib/ace/theme/tomorrow.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = false;

12
lib/ace/theme/tomorrow_night.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: F96223EB-1A60-4617-92F3-D24D4F13DB09) */
.ace-tomorrow-night .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -77,7 +77,7 @@
color:#8ABEB7;
}
.ace-tomorrow-night .ace_constant.ace_character, {
.ace-tomorrow-night .ace_constant.ace_character {
color:#DE935F;
}
@ -116,6 +116,14 @@ background-color:#B798BF;
color:#81A2BE;
}
.ace-tomorrow-night .ace_support.ace_type {
color:#F0C674;
}
.ace-tomorrow-night .ace_support.ace_class {
color:#F0C674;
}
.ace-tomorrow-night .ace_storage {
color:#B294BB;
}

2
lib/ace/theme/tomorrow_night.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

12
lib/ace/theme/tomorrow_night_blue.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: 3F4BB232-3C3A-4396-99C0-06A9573715E9) */
.ace-tomorrow-night-blue .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -77,7 +77,7 @@
color:#99FFFF;
}
.ace-tomorrow-night-blue .ace_constant.ace_character, {
.ace-tomorrow-night-blue .ace_constant.ace_character {
color:#FFC58F;
}
@ -116,6 +116,14 @@ background-color:#EBBBFF;
color:#BBDAFF;
}
.ace-tomorrow-night-blue .ace_support.ace_type {
color:#FFEEAD;
}
.ace-tomorrow-night-blue .ace_support.ace_class {
color:#FFEEAD;
}
.ace-tomorrow-night-blue .ace_storage {
color:#EBBBFF;
}

2
lib/ace/theme/tomorrow_night_blue.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

12
lib/ace/theme/tomorrow_night_bright.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: 33D8C715-AD3A-455B-8DF2-56F708909FFE) */
.ace-tomorrow-night-bright .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -77,7 +77,7 @@
color:#70C0B1;
}
.ace-tomorrow-night-bright .ace_constant.ace_character, {
.ace-tomorrow-night-bright .ace_constant.ace_character {
color:#E78C45;
}
@ -116,6 +116,14 @@ background-color:#B798BF;
color:#7AA6DA;
}
.ace-tomorrow-night-bright .ace_support.ace_type {
color:#E7C547;
}
.ace-tomorrow-night-bright .ace_support.ace_class {
color:#E7C547;
}
.ace-tomorrow-night-bright .ace_storage {
color:#C397D8;
}

2
lib/ace/theme/tomorrow_night_bright.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

12
lib/ace/theme/tomorrow_night_eighties.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: DE477E5B-BD4D-46B0-BF80-2EA32A2814D5) */
.ace-tomorrow-night-eighties .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -77,7 +77,7 @@
color:#66CCCC;
}
.ace-tomorrow-night-eighties .ace_constant.ace_character, {
.ace-tomorrow-night-eighties .ace_constant.ace_character {
color:#F99157;
}
@ -116,6 +116,14 @@ background-color:#CC99CC;
color:#6699CC;
}
.ace-tomorrow-night-eighties .ace_support.ace_type {
color:#FFCC66;
}
.ace-tomorrow-night-eighties .ace_support.ace_class {
color:#FFCC66;
}
.ace-tomorrow-night-eighties .ace_storage {
color:#CC99CC;
}

2
lib/ace/theme/tomorrow_night_eighties.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

6
lib/ace/theme/twilight.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: 766026CB-703D-4610-B070-8DE07D967C5F) */
.ace-twilight .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -77,10 +77,6 @@
color:#CF6A4C;
}
.ace-twilight .ace_constant.ace_character.ace_escape, {
color:#CF6A4C;
}
.ace-twilight .ace_invalid.ace_illegal {
color:#F8F8F8;
background-color:rgba(86, 45, 86, 0.75);

2
lib/ace/theme/twilight.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

6
lib/ace/theme/vibrant_ink.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: 4B7A9AA6-C472-4460-BA48-199E2624956B) */
.ace-vibrant-ink .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -77,10 +77,6 @@
color:#339999;
}
.ace-vibrant-ink .ace_constant.ace_character.ace_escape, {
color:#339999;
}
.ace-vibrant-ink .ace_constant.ace_numeric {
color:#99CC99;
}

2
lib/ace/theme/vibrant_ink.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = true;

20
tool/Theme.tmpl.css
View file

@ -1,4 +1,4 @@
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css */
/* THIS THEME WAS AUTOGENERATED BY Theme.tmpl.css (UUID: %uuid%) */
.%cssClass% .ace_editor {
border: 2px solid rgb(159, 159, 159);
@ -81,12 +81,12 @@
%constant%
}
.%cssClass% .ace_constant.ace_character, {
.%cssClass% .ace_constant.ace_character {
%constant.character%
}
.%cssClass% .ace_constant.ace_character.ace_escape, {
%constant%
.%cssClass% .ace_constant.ace_character.ace_escape {
%constant.character.escape%
}
.%cssClass% .ace_constant.ace_language {
@ -134,6 +134,18 @@
%support.function%
}
.%cssClass% .ace_support.ace_type {
%support.type%
}
.%cssClass% .ace_support.ace_class {
%support.class%
}
.%cssClass% .ace_support.ace_other {
%support.other%
}
.%cssClass% .ace_storage {
%storage%
}

11
tool/mode_highlight_rules.tmpl.js
View file

@ -34,14 +34,18 @@
* ***** END LICENSE BLOCK ***** */
/*
THIS FILE WAS AUTOGENERATED BY mode_highlight_rules.tmpl.js
THIS FILE WAS AUTOGENERATED BY mode_highlight_rules.tmpl.js (UUID: %uuid%) */
IT MIGHT NOT BE PERFECT, PARTICULARLY:
/*******
THIS FILE MIGHT NOT BE PERFECT, PARTICULARLY:
IN DECIDING STATES TO TRANSITION TO,
IGNORING WHITESPACE,
IGNORING GROUPS WITH ?:,
EXTENDING EXISTING MODES,
GATHERING KEYWORDS, OR
@ -49,7 +53,8 @@
RULE PREFERENCE ORDER.
...But it's a good start from an existing *.tmlanguage file.
*/
*******/
define(function(require, exports, module) {
"use strict";

2
tool/theme.tmpl.js
View file

@ -28,8 +28,6 @@
*
* ***** END LICENSE BLOCK ***** */
// THIS FILE WAS AUTOGENERATED BY theme.tmpl.js
define(function(require, exports, module) {
exports.isDark = %isDark%;

31
tool/tmlanguage.js
View file

@ -164,7 +164,6 @@ function extractPatterns(patterns) {
tokenObj.regex = checkForLookBehind(pattern.begin);
tokenObj.next = strState;
startState.start.push(tokenObj);
}
else if( ( pattern.begin || pattern.end ) && !( pattern.begin && pattern.end ) ) {
logDebug("Somehow, there's pattern.begin or pattern.end--but not both?", pattern);
@ -174,27 +173,30 @@ function extractPatterns(patterns) {
tokenObj.token.push([]);
tokenObj.token.push(pattern.captures);
tokenObj.regex = checkForLookBehind(pattern.match);
startState.start.push(tokenObj);
}
else if (pattern.match) {
tokenObj.token.push(pattern.name);
tokenObj.regex = checkForLookBehind(pattern.match);
startState.start.push(tokenObj);
}
else if (pattern.include) {
tokenObj.token.push(pattern.include);
tokenObj.regex = "";
startState.start.push(tokenObj);
}
else {
tokenObj.token.push("");
tokenObj.regex = "";
logDebug("I've gone through every choice, and have no clue what this is:", pattern);
}
// sometimes captures have names--not sure when or why
if (pattern.name) {
tokenObj.token.push(pattern.name);
}
startState.start.push(tokenObj);
});
var resultingObj = startState;
@ -229,16 +231,19 @@ function convertLanguage(name) {
if (devMode)
console.log(util.inspect(language.patterns, false, 4));
var patterns = extractPatterns(language.patterns);
var languageHighlightRules = fillTemplate(modeHighlightTemplate, {
language: languageNameSanitized,
languageTokens: patterns
});
var languageMode = fillTemplate(modeTemplate, {
language: languageNameSanitized,
languageHighlightFilename: languageHighlightFilename
});
var patterns = extractPatterns(language.patterns);
var languageHighlightRules = fillTemplate(modeHighlightTemplate, {
language: languageNameSanitized,
languageTokens: patterns,
uuid: language.uuid
});
if (devMode) {
console.log("Not writing, 'cause we're in dev mode, baby.");

4
tool/tmtheme.js
View file

@ -27,6 +27,9 @@ var supportedScopes = {
"support.function.firebug": "support.firebug",
"support.function.constant": "support.function.constant",
"support.constant": "support.constant",
"support.class": "support.class",
"support.type": "support.type",
"support.other": "support.other",
"function": "function",
"function.buildin": "function.buildin",
@ -206,6 +209,7 @@ function convertTheme(name) {
var styles = extractStyles(theme);
styles.cssClass = "ace-" + hyphenate(name);
styles.uuid = theme.uuid;
var css = fillTemplate(cssTemplate, styles);
css = css.replace(/[^\{\}]+{\s*}/g, "");