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

Merge branch 'mode/typescript' of github.com:ajaxorg/ace into mode/typescript

Browse source
This commit is contained in:
Garen Torikian 2012-10-02 15:05:51 -07:00
commit ef4327769a
1 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/ace/mode/typescript_highlight_rules.js
View file

@ -17,7 +17,7 @@
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@ -47,9 +47,7 @@ var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScrip
var TypeScriptHighlightRules = function() { var TypeScriptHighlightRules = function() {
this.$rules = var tsRules = [
{
"start": [
// Match stuff like: module name {...} // Match stuff like: module name {...}
{ {
"token": ["keyword.operator.ts", "text", "variable.parameter.function.ts", "text"], "token": ["keyword.operator.ts", "text", "variable.parameter.function.ts", "text"],
@ -77,22 +75,21 @@ var TypeScriptHighlightRules = function() {
{ {
"token": ["storage.type.variable.ts"], "token": ["storage.type.variable.ts"],
"regex": "(?:\\b(this\\.|string\\b|bool\\b|number)\\b)" "regex": "(?:\\b(this\\.|string\\b|bool\\b|number)\\b)"
},
{
"token": ["keyword.operator.ts", "storage.type.variable.ts", "keyword.operator.ts", "storage.type.variable.ts"],
"regex": "(class)(\\s+[a-zA-Z0-9_?.$][\\w?.$]*\\s+)(extends)(\\s+[a-zA-Z0-9_?.$][\\w?.$]*\\s+)?"
},
{
"token": "keyword",
"regex": "(?:super|export|class|extends|import)\\b"
} }
] ];
}
var JSRules = new JavaScriptHighlightRules().getRules(); var JSRules = new JavaScriptHighlightRules().getRules();
// copy in JS rules directly
for (var r in JSRules) { JSRules.start = tsRules.concat(JSRules.start);
if (r == "start") { this.$rules = JSRules;
for (var key in JSRules[r]) {
this.$rules.start.push(JSRules[r][key])
}
}
else {
this.$rules[r] = JSRules[r];
}
}
}; };
oop.inherits(TypeScriptHighlightRules, JavaScriptHighlightRules); oop.inherits(TypeScriptHighlightRules, JavaScriptHighlightRules);