From 7d7352954e5342c40d3f7ae419069c8f0fc0aae8 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Mon, 14 Oct 2013 16:06:29 +0400
Subject: [PATCH] Fix absence of highlighting for 'as', 'in', 'is' keywords

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

diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java
index b105be810fb..52789c34d3a 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java
@@ -57,12 +57,13 @@ public class JetHighlighter extends SyntaxHighlighterBase {
         keys1.put(JetTokens.INTEGER_LITERAL, JetHighlightingColors.NUMBER);
         keys1.put(JetTokens.FLOAT_LITERAL, JetHighlightingColors.NUMBER);
 
-        fillMap(keys1, TokenSet.andNot(
-                JetTokens.OPERATIONS,
-                TokenSet.andNot(
-                        TokenSet.create(JetTokens.IDENTIFIER, JetTokens.LABEL_IDENTIFIER),
-                        JetTokens.KEYWORDS)),
+        fillMap(keys1,
+                TokenSet.andNot(JetTokens.OPERATIONS,
+                                TokenSet.orSet(
+                                        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);