From 210dcaf4fd3365d302bbd3f6720e6767d31ce82d Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Tue, 8 Feb 2011 12:33:12 +0100 Subject: [PATCH] fix keyword lookup in the tokenizers --- lib/ace/mode/c_cpp_highlight_rules.js | 6 ++---- lib/ace/mode/css_highlight_rules.js | 8 ++++---- lib/ace/mode/java_highlight_rules.js | 4 ++-- lib/ace/mode/javascript_highlight_rules.js | 6 +++--- lib/ace/mode/php_highlight_rules.js | 10 +++++----- lib/ace/mode/python_highlight_rules.js | 8 ++++---- lib/ace/mode/ruby_highlight_rules.js | 8 ++++---- 7 files changed, 24 insertions(+), 26 deletions(-) diff --git a/lib/ace/mode/c_cpp_highlight_rules.js b/lib/ace/mode/c_cpp_highlight_rules.js index 96d1a428..9c829915 100644 --- a/lib/ace/mode/c_cpp_highlight_rules.js +++ b/lib/ace/mode/c_cpp_highlight_rules.js @@ -108,12 +108,10 @@ c_cppHighlightRules = function() { token : function(value) { if (value == "this") return "variable.language"; - else if (keywords[value]) + else if (keywords.hasOwnProperty(value)) return "keyword"; - else if (buildinConstants[value]) + else if (buildinConstants.hasOwnProperty(value)) return "constant.language"; - else if (value == "debugger") - return "invalid.deprecated"; else return "identifier"; }, diff --git a/lib/ace/mode/css_highlight_rules.js b/lib/ace/mode/css_highlight_rules.js index f13c821e..a312ee0c 100644 --- a/lib/ace/mode/css_highlight_rules.js +++ b/lib/ace/mode/css_highlight_rules.js @@ -198,16 +198,16 @@ var CssHighlightRules = function() { regex : "\}" }, { token : function(value) { - if (properties[value.toLowerCase()]) { + if (properties.hasOwnProperty(value.toLowerCase())) { return "support.type"; } - else if (functions[value.toLowerCase()]) { + else if (functions.hasOwnProperty(value.toLowerCase())) { return "support.function"; } - else if (constants[value.toLowerCase()]) { + else if (constants.hasOwnProperty(value.toLowerCase())) { return "support.constant"; } - else if (colors[value.toLowerCase()]) { + else if (colors.hasOwnProperty(value.toLowerCase())) { return "support.constant.color"; } else { diff --git a/lib/ace/mode/java_highlight_rules.js b/lib/ace/mode/java_highlight_rules.js index a120ea2b..1dc5af93 100644 --- a/lib/ace/mode/java_highlight_rules.js +++ b/lib/ace/mode/java_highlight_rules.js @@ -68,9 +68,9 @@ JavaHighlightRules = function() { token : function(value) { if (value == "this") return "variable.language"; - else if (keywords[value]) + else if (keywords.hasOwnProperty(value)) return "keyword"; - else if (buildinConstants[value]) + else if (buildinConstants.hasOwnProperty(value)) return "constant.language"; else return "identifier"; diff --git a/lib/ace/mode/javascript_highlight_rules.js b/lib/ace/mode/javascript_highlight_rules.js index fd66db1a..0ecf0768 100644 --- a/lib/ace/mode/javascript_highlight_rules.js +++ b/lib/ace/mode/javascript_highlight_rules.js @@ -104,11 +104,11 @@ JavaScriptHighlightRules = function() { token : function(value) { if (value == "this") return "variable.language"; - else if (keywords[value]) + else if (keywords.hasOwnProperty(value)) return "keyword"; - else if (buildinConstants[value]) + else if (buildinConstants.hasOwnProperty(value)) return "constant.language"; - else if (futureReserved[value]) + else if (futureReserved.hasOwnProperty(value)) return "invalid.illegal"; else if (value == "debugger") return "invalid.deprecated"; diff --git a/lib/ace/mode/php_highlight_rules.js b/lib/ace/mode/php_highlight_rules.js index 4e14a320..0b4b4b48 100644 --- a/lib/ace/mode/php_highlight_rules.js +++ b/lib/ace/mode/php_highlight_rules.js @@ -527,15 +527,15 @@ PhpHighlightRules = function() { "T(?:HOUS(?:ANDS_SEP|EP)|_FMT(?:_AMPM|))|YES(?:EXPR|STR)|STD(?:IN|OUT|ERR))\\b" }, { token : function(value) { - if (keywords[value]) + if (keywords.hasOwnProperty(value)) return "keyword"; - else if (builtinConstants[value]) + else if (builtinConstants.hasOwnProperty(value)) return "constant.language"; - else if (builtinVariables[value]) + else if (builtinVariables.hasOwnProperty(value)) return "variable.language"; - else if (futureReserved[value]) + else if (futureReserved.hasOwnProperty(value)) return "invalid.illegal"; - else if (builtinFunctions[value]) + else if (builtinFunctions.hasOwnProperty(value)) return "support.function"; else if (value == "debugger") return "invalid.deprecated"; diff --git a/lib/ace/mode/python_highlight_rules.js b/lib/ace/mode/python_highlight_rules.js index 3a2499c7..e16c9905 100644 --- a/lib/ace/mode/python_highlight_rules.js +++ b/lib/ace/mode/python_highlight_rules.js @@ -124,13 +124,13 @@ PythonHighlightRules = function() { regex : integer + "\\b" }, { token : function(value) { - if (keywords[value]) + if (keywords.hasOwnProperty(value)) return "keyword"; - else if (builtinConstants[value]) + else if (builtinConstants.hasOwnProperty(value)) return "constant.language"; - else if (futureReserved[value]) + else if (futureReserved.hasOwnProperty(value)) return "invalid.illegal"; - else if (builtinFunctions[value]) + else if (builtinFunctions.hasOwnProperty(value)) return "support.function"; else if (value == "debugger") return "invalid.deprecated"; diff --git a/lib/ace/mode/ruby_highlight_rules.js b/lib/ace/mode/ruby_highlight_rules.js index 27187068..bba309fb 100644 --- a/lib/ace/mode/ruby_highlight_rules.js +++ b/lib/ace/mode/ruby_highlight_rules.js @@ -99,13 +99,13 @@ RubyHighlightRules = function() { token : function(value) { if (value == "self") return "variable.language"; - else if (keywords[value]) + else if (keywords.hasOwnProperty(value)) return "keyword"; - else if (buildinConstants[value]) + else if (buildinConstants.hasOwnProperty(value)) return "constant.language"; - else if (builtinVariables[value]) + else if (builtinVariables.hasOwnProperty(value)) return "variable.language"; - else if (builtinFunctions[value]) + else if (builtinFunctions.hasOwnProperty(value)) return "support.function"; else if (value == "debugger") return "invalid.deprecated";