From 344ed3f6063c11a8e24d197548582725897bab5d Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Thu, 26 Sep 2013 15:43:45 +0400
Subject: [PATCH] Refactoring: Fix warnings

---
 .../jet/plugin/highlighter/JetHighlighter.java        | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java
index f9bb1e3a895..b105be810fb 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java
@@ -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);