From 09229a6f0762d6b3dc9436b1be4da1fd026a1fdb Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 2 Apr 2012 17:33:33 +0400 Subject: [PATCH] Removed unnecessary keys2 map from JetHighlighter. --- .../plugin/highlighter/JetHighlighter.java | 69 +++++++++---------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java index be74e14d5ea..6f99c1f92ae 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java @@ -33,8 +33,7 @@ import java.util.HashMap; import java.util.Map; public class JetHighlighter extends SyntaxHighlighterBase { - private static final Map keys1; - private static final Map keys2; + private static final Map keys; @NotNull public Lexer getHighlightingLexer() { @@ -43,52 +42,50 @@ public class JetHighlighter extends SyntaxHighlighterBase { @NotNull public TextAttributesKey[] getTokenHighlights(IElementType tokenType) { - return pack(keys1.get(tokenType), keys2.get(tokenType)); + return pack(keys.get(tokenType)); } static { - keys1 = new HashMap(); - keys2 = new HashMap(); + keys = new HashMap(); + fillMap(keys, JetTokens.KEYWORDS, JetHighlightingColors.KEYWORD); - fillMap(keys1, JetTokens.KEYWORDS, JetHighlightingColors.KEYWORD); + keys.put(JetTokens.AS_SAFE, JetHighlightingColors.KEYWORD); + keys.put(JetTokens.LABEL_IDENTIFIER, JetHighlightingColors.LABEL); + keys.put(JetTokens.ATAT, JetHighlightingColors.LABEL); + keys.put(JetTokens.INTEGER_LITERAL, JetHighlightingColors.NUMBER); + keys.put(JetTokens.FLOAT_LITERAL, JetHighlightingColors.NUMBER); - keys1.put(JetTokens.AS_SAFE, JetHighlightingColors.KEYWORD); - keys1.put(JetTokens.LABEL_IDENTIFIER, JetHighlightingColors.LABEL); - keys1.put(JetTokens.ATAT, JetHighlightingColors.LABEL); - keys1.put(JetTokens.INTEGER_LITERAL, JetHighlightingColors.NUMBER); - keys1.put(JetTokens.FLOAT_LITERAL, JetHighlightingColors.NUMBER); - - fillMap(keys1, JetTokens.OPERATIONS.minus( + fillMap(keys, JetTokens.OPERATIONS.minus( TokenSet.create(JetTokens.IDENTIFIER, JetTokens.LABEL_IDENTIFIER)).minus( JetTokens.KEYWORDS), JetHighlightingColors.OPERATOR_SIGN); - keys1.put(JetTokens.LPAR, JetHighlightingColors.PARENTHESIS); - keys1.put(JetTokens.RPAR, JetHighlightingColors.PARENTHESIS); - keys1.put(JetTokens.LBRACE, JetHighlightingColors.BRACES); - keys1.put(JetTokens.RBRACE, JetHighlightingColors.BRACES); - keys1.put(JetTokens.LBRACKET, JetHighlightingColors.BRACKETS); - keys1.put(JetTokens.RBRACKET, JetHighlightingColors.BRACKETS); - keys1.put(JetTokens.COMMA, JetHighlightingColors.COMMA); - keys1.put(JetTokens.SEMICOLON, JetHighlightingColors.SEMICOLON); - keys1.put(JetTokens.DOT, JetHighlightingColors.DOT); - keys1.put(JetTokens.SAFE_ACCESS, JetHighlightingColors.SAFE_ACCESS); - keys1.put(JetTokens.ARROW, JetHighlightingColors.ARROW); + keys.put(JetTokens.LPAR, JetHighlightingColors.PARENTHESIS); + keys.put(JetTokens.RPAR, JetHighlightingColors.PARENTHESIS); + keys.put(JetTokens.LBRACE, JetHighlightingColors.BRACES); + keys.put(JetTokens.RBRACE, JetHighlightingColors.BRACES); + keys.put(JetTokens.LBRACKET, JetHighlightingColors.BRACKETS); + keys.put(JetTokens.RBRACKET, JetHighlightingColors.BRACKETS); + keys.put(JetTokens.COMMA, JetHighlightingColors.COMMA); + keys.put(JetTokens.SEMICOLON, JetHighlightingColors.SEMICOLON); + keys.put(JetTokens.DOT, JetHighlightingColors.DOT); + keys.put(JetTokens.SAFE_ACCESS, JetHighlightingColors.SAFE_ACCESS); + keys.put(JetTokens.ARROW, JetHighlightingColors.ARROW); - keys1.put(JetTokens.OPEN_QUOTE, JetHighlightingColors.STRING); - keys1.put(JetTokens.CLOSING_QUOTE, JetHighlightingColors.STRING); - keys1.put(JetTokens.REGULAR_STRING_PART, JetHighlightingColors.STRING); - keys1.put(JetTokens.LONG_TEMPLATE_ENTRY_END, JetHighlightingColors.VALID_STRING_ESCAPE); - keys1.put(JetTokens.LONG_TEMPLATE_ENTRY_START, JetHighlightingColors.VALID_STRING_ESCAPE); - keys1.put(JetTokens.SHORT_TEMPLATE_ENTRY_START, JetHighlightingColors.VALID_STRING_ESCAPE); + keys.put(JetTokens.OPEN_QUOTE, JetHighlightingColors.STRING); + keys.put(JetTokens.CLOSING_QUOTE, JetHighlightingColors.STRING); + keys.put(JetTokens.REGULAR_STRING_PART, JetHighlightingColors.STRING); + keys.put(JetTokens.LONG_TEMPLATE_ENTRY_END, JetHighlightingColors.VALID_STRING_ESCAPE); + keys.put(JetTokens.LONG_TEMPLATE_ENTRY_START, JetHighlightingColors.VALID_STRING_ESCAPE); + keys.put(JetTokens.SHORT_TEMPLATE_ENTRY_START, JetHighlightingColors.VALID_STRING_ESCAPE); - keys1.put(JetTokens.ESCAPE_SEQUENCE, JetHighlightingColors.VALID_STRING_ESCAPE); + keys.put(JetTokens.ESCAPE_SEQUENCE, JetHighlightingColors.VALID_STRING_ESCAPE); - keys1.put(JetTokens.CHARACTER_LITERAL, JetHighlightingColors.STRING); + keys.put(JetTokens.CHARACTER_LITERAL, JetHighlightingColors.STRING); - keys1.put(JetTokens.EOL_COMMENT, JetHighlightingColors.LINE_COMMENT); - keys1.put(JetTokens.BLOCK_COMMENT, JetHighlightingColors.BLOCK_COMMENT); - keys1.put(JetTokens.DOC_COMMENT, JetHighlightingColors.DOC_COMMENT); + keys.put(JetTokens.EOL_COMMENT, JetHighlightingColors.LINE_COMMENT); + keys.put(JetTokens.BLOCK_COMMENT, JetHighlightingColors.BLOCK_COMMENT); + keys.put(JetTokens.DOC_COMMENT, JetHighlightingColors.DOC_COMMENT); - keys1.put(TokenType.BAD_CHARACTER, JetHighlightingColors.BAD_CHARACTER); + keys.put(TokenType.BAD_CHARACTER, JetHighlightingColors.BAD_CHARACTER); } }