azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring: Fix warnings

Browse Source
This commit is contained in:
Nikolay Krasko
2013-09-26 15:43:45 +04:00
parent 4cd5c66c27
commit 344ed3f606
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java
+8 -3
View File
@@ -33,11 +33,13 @@ public class JetHighlighter extends SyntaxHighlighterBase {
private static final Map<IElementType, TextAttributesKey> keys1;
private static final Map<IElementType, TextAttributesKey> keys2;
@Override
@NotNull
public Lexer getHighlightingLexer() {
return new JetHighlightingLexer();
}
@Override
@NotNull
public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
return pack(keys1.get(tokenType), keys2.get(tokenType));
@@ -55,9 +57,12 @@ public class JetHighlighter extends SyntaxHighlighterBase {
keys1.put(JetTokens.INTEGER_LITERAL, JetHighlightingColors.NUMBER);
keys1.put(JetTokens.FLOAT_LITERAL, JetHighlightingColors.NUMBER);
fillMap(keys1, JetTokens.OPERATIONS.minus(
TokenSet.create(JetTokens.IDENTIFIER, JetTokens.LABEL_IDENTIFIER)).minus(
JetTokens.KEYWORDS), JetHighlightingColors.OPERATOR_SIGN);
fillMap(keys1, TokenSet.andNot(
JetTokens.OPERATIONS,
TokenSet.andNot(
TokenSet.create(JetTokens.IDENTIFIER, JetTokens.LABEL_IDENTIFIER),
JetTokens.KEYWORDS)),
JetHighlightingColors.OPERATOR_SIGN);
keys1.put(JetTokens.LPAR, JetHighlightingColors.PARENTHESIS);
keys1.put(JetTokens.RPAR, JetHighlightingColors.PARENTHESIS);
keys1.put(JetTokens.LBRACE, JetHighlightingColors.BRACES);