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

fix keyword lookup in the tokenizers

Browse source
This commit is contained in:
Fabian Jakobs 2011-02-08 12:33:12 +01:00
commit 210dcaf4fd
7 changed files with 24 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,12 +108,10 @@ c_cppHighlightRules = function() {
token : function(value) { token : function(value) {
if (value == "this") if (value == "this")
return "variable.language"; return "variable.language";
else if (keywords[value]) else if (keywords.hasOwnProperty(value))
return "keyword"; return "keyword";
else if (buildinConstants[value]) else if (buildinConstants.hasOwnProperty(value))
return "constant.language"; return "constant.language";
else if (value == "debugger")
return "invalid.deprecated";
else else
return "identifier"; return "identifier";
}, },

8
lib/ace/mode/css_highlight_rules.js
View file

@ -198,16 +198,16 @@ var CssHighlightRules = function() {
regex : "\}" regex : "\}"
}, { }, {
token : function(value) { token : function(value) {
if (properties[value.toLowerCase()]) { if (properties.hasOwnProperty(value.toLowerCase())) {
return "support.type"; return "support.type";
} }
else if (functions[value.toLowerCase()]) { else if (functions.hasOwnProperty(value.toLowerCase())) {
return "support.function"; return "support.function";
} }
else if (constants[value.toLowerCase()]) { else if (constants.hasOwnProperty(value.toLowerCase())) {
return "support.constant"; return "support.constant";
} }
else if (colors[value.toLowerCase()]) { else if (colors.hasOwnProperty(value.toLowerCase())) {
return "support.constant.color"; return "support.constant.color";
} }
else { else {

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

@ -68,9 +68,9 @@ JavaHighlightRules = function() {
token : function(value) { token : function(value) {
if (value == "this") if (value == "this")
return "variable.language"; return "variable.language";
else if (keywords[value]) else if (keywords.hasOwnProperty(value))
return "keyword"; return "keyword";
else if (buildinConstants[value]) else if (buildinConstants.hasOwnProperty(value))
return "constant.language"; return "constant.language";
else else
return "identifier"; return "identifier";

6
lib/ace/mode/javascript_highlight_rules.js
View file

@ -104,11 +104,11 @@ JavaScriptHighlightRules = function() {
token : function(value) { token : function(value) {
if (value == "this") if (value == "this")
return "variable.language"; return "variable.language";
else if (keywords[value]) else if (keywords.hasOwnProperty(value))
return "keyword"; return "keyword";
else if (buildinConstants[value]) else if (buildinConstants.hasOwnProperty(value))
return "constant.language"; return "constant.language";
else if (futureReserved[value]) else if (futureReserved.hasOwnProperty(value))
return "invalid.illegal"; return "invalid.illegal";
else if (value == "debugger") else if (value == "debugger")
return "invalid.deprecated"; return "invalid.deprecated";

10
lib/ace/mode/php_highlight_rules.js
View file

@ -527,15 +527,15 @@ PhpHighlightRules = function() {
"T(?:HOUS(?:ANDS_SEP|EP)|_FMT(?:_AMPM|))|YES(?:EXPR|STR)|STD(?:IN|OUT|ERR))\\b" "T(?:HOUS(?:ANDS_SEP|EP)|_FMT(?:_AMPM|))|YES(?:EXPR|STR)|STD(?:IN|OUT|ERR))\\b"
}, { }, {
token : function(value) { token : function(value) {
if (keywords[value]) if (keywords.hasOwnProperty(value))
return "keyword"; return "keyword";
else if (builtinConstants[value]) else if (builtinConstants.hasOwnProperty(value))
return "constant.language"; return "constant.language";
else if (builtinVariables[value]) else if (builtinVariables.hasOwnProperty(value))
return "variable.language"; return "variable.language";
else if (futureReserved[value]) else if (futureReserved.hasOwnProperty(value))
return "invalid.illegal"; return "invalid.illegal";
else if (builtinFunctions[value]) else if (builtinFunctions.hasOwnProperty(value))
return "support.function"; return "support.function";
else if (value == "debugger") else if (value == "debugger")
return "invalid.deprecated"; return "invalid.deprecated";

8
lib/ace/mode/python_highlight_rules.js
View file

@ -124,13 +124,13 @@ PythonHighlightRules = function() {
regex : integer + "\\b" regex : integer + "\\b"
}, { }, {
token : function(value) { token : function(value) {
if (keywords[value]) if (keywords.hasOwnProperty(value))
return "keyword"; return "keyword";
else if (builtinConstants[value]) else if (builtinConstants.hasOwnProperty(value))
return "constant.language"; return "constant.language";
else if (futureReserved[value]) else if (futureReserved.hasOwnProperty(value))
return "invalid.illegal"; return "invalid.illegal";
else if (builtinFunctions[value]) else if (builtinFunctions.hasOwnProperty(value))
return "support.function"; return "support.function";
else if (value == "debugger") else if (value == "debugger")
return "invalid.deprecated"; return "invalid.deprecated";

8
lib/ace/mode/ruby_highlight_rules.js
View file

@ -99,13 +99,13 @@ RubyHighlightRules = function() {
token : function(value) { token : function(value) {
if (value == "self") if (value == "self")
return "variable.language"; return "variable.language";
else if (keywords[value]) else if (keywords.hasOwnProperty(value))
return "keyword"; return "keyword";
else if (buildinConstants[value]) else if (buildinConstants.hasOwnProperty(value))
return "constant.language"; return "constant.language";
else if (builtinVariables[value]) else if (builtinVariables.hasOwnProperty(value))
return "variable.language"; return "variable.language";
else if (builtinFunctions[value]) else if (builtinFunctions.hasOwnProperty(value))
return "support.function"; return "support.function";
else if (value == "debugger") else if (value == "debugger")
return "invalid.deprecated"; return "invalid.deprecated";