diff --git a/CFML/gen/com/intellij/coldFusion/model/lexer/_CfscriptLexer.java b/CFML/gen/com/intellij/coldFusion/model/lexer/_CfscriptLexer.java index 95baa6cb5f5..d218a9a8a38 100644 --- a/CFML/gen/com/intellij/coldFusion/model/lexer/_CfscriptLexer.java +++ b/CFML/gen/com/intellij/coldFusion/model/lexer/_CfscriptLexer.java @@ -1800,7 +1800,7 @@ else if (zzAtEOF) { // fall through case 222: break; case 103: - { return CfscriptTokenTypes.BOOLAEN_TYPE; + { return CfscriptTokenTypes.BOOLEAN_TYPE; } // fall through case 223: break; diff --git a/CFML/src/com/intellij/coldFusion/model/lexer/CfscriptTokenTypes.java b/CFML/src/com/intellij/coldFusion/model/lexer/CfscriptTokenTypes.java index a1c00c464d0..e846e98a0f1 100644 --- a/CFML/src/com/intellij/coldFusion/model/lexer/CfscriptTokenTypes.java +++ b/CFML/src/com/intellij/coldFusion/model/lexer/CfscriptTokenTypes.java @@ -183,7 +183,7 @@ public interface CfscriptTokenTypes { IElementType ANY_TYPE = new CfmlElementType("ANY_TYPE"); IElementType ARRAY_TYPE = new CfmlElementType("ARRAY_TYPE"); IElementType BINARY_TYPE = new CfmlElementType("BINARY_TYPE"); - IElementType BOOLAEN_TYPE = new CfmlElementType("BOOLAEN_TYPE"); + IElementType BOOLEAN_TYPE = new CfmlElementType("BOOLEAN_TYPE"); IElementType DATE_TYPE = new CfmlElementType("DATE_TYPE"); IElementType GUID_TYPE = new CfmlElementType("GUID_TYPE"); IElementType NUMERIC_TYPE = new CfmlElementType("NUMERIC_TYPE"); @@ -199,7 +199,7 @@ public interface CfscriptTokenTypes { IElementType IMPORT_KEYWORD = new CfmlElementType("IMPORT_KEYWORD"); TokenSet TYPE_KEYWORDS = TokenSet - .create(ANY_TYPE, ARRAY_TYPE, BINARY_TYPE, BOOLAEN_TYPE, DATE_TYPE, GUID_TYPE, NUMERIC_TYPE, QUERY_TYPE, STRING_TYPE, STRUCT_TYPE, + .create(ANY_TYPE, ARRAY_TYPE, BINARY_TYPE, BOOLEAN_TYPE, DATE_TYPE, GUID_TYPE, NUMERIC_TYPE, QUERY_TYPE, STRING_TYPE, STRUCT_TYPE, UUID_TYPE, VARIABLENAME_TYPE, VOID_TYPE, XML_TYPE, COMPONENT_KEYWORD); TokenSet ACCESS_KEYWORDS = TokenSet.create(PUBLIC_KEYWORD, PRIVATE_KEYWORD, REMOTE_KEYWORD, PACKAGE_KEYWORD); @@ -211,7 +211,7 @@ public interface CfscriptTokenTypes { COMPONENT_KEYWORD, INTERFACE_KEYWORD, PUBLIC_KEYWORD, PRIVATE_KEYWORD, REMOTE_KEYWORD, PACKAGE_KEYWORD, REQUIRED_KEYWORD, - ANY_TYPE, ARRAY_TYPE, BINARY_TYPE, BOOLAEN_TYPE, DATE_TYPE, GUID_TYPE, NUMERIC_TYPE, QUERY_TYPE, STRING_TYPE, STRUCT_TYPE, + ANY_TYPE, ARRAY_TYPE, BINARY_TYPE, BOOLEAN_TYPE, DATE_TYPE, GUID_TYPE, NUMERIC_TYPE, QUERY_TYPE, STRING_TYPE, STRUCT_TYPE, UUID_TYPE, VARIABLENAME_TYPE, VOID_TYPE, XML_TYPE, FINALLY_KEYWORD, IMPORT_KEYWORD, ACTION_NAME); diff --git a/CFML/src/com/intellij/coldFusion/model/lexer/ColdFusionScript.flex b/CFML/src/com/intellij/coldFusion/model/lexer/ColdFusionScript.flex index e28a58fd564..847dff4b9d2 100644 --- a/CFML/src/com/intellij/coldFusion/model/lexer/ColdFusionScript.flex +++ b/CFML/src/com/intellij/coldFusion/model/lexer/ColdFusionScript.flex @@ -146,7 +146,7 @@ VARIABLE_TYPE_DECL = (("/*"){WHITE_SPACE_CHAR}"@cfmlvariable"~("*/"))|(("//"){WH "any" { return CfscriptTokenTypes.ANY_TYPE; } "array" { return CfscriptTokenTypes.ARRAY_TYPE; } "binary" { return CfscriptTokenTypes.BINARY_TYPE; } - "boolean" { return CfscriptTokenTypes.BOOLAEN_TYPE; } + "boolean" { return CfscriptTokenTypes.BOOLEAN_TYPE; } "date" { return CfscriptTokenTypes.DATE_TYPE; } "guid" { return CfscriptTokenTypes.GUID_TYPE; } "numeric" { return CfscriptTokenTypes.NUMERIC_TYPE; }