From 69890bd6ec451630bea59b71acd148c1e1ca1a8e Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 23 Apr 2014 17:18:17 +0400
Subject: [PATCH] Refactor: Store token in JetProjectionKind

---
 .../jet/lang/psi/JetProjectionKind.java        | 18 +++++++++++++++++-
 .../jet/lang/psi/JetTypeProjection.java        | 13 +++++++------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProjectionKind.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProjectionKind.java
index e37b17684d9..733df22373b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProjectionKind.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProjectionKind.java
@@ -16,6 +16,22 @@
 
 package org.jetbrains.jet.lang.psi;
 
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.lexer.JetSingleValueToken;
+import org.jetbrains.jet.lexer.JetTokens;
+
 public enum JetProjectionKind {
-    IN, OUT, STAR, NONE;
+    IN(JetTokens.IN_KEYWORD), OUT(JetTokens.OUT_KEYWORD), STAR(JetTokens.MUL), NONE(null);
+
+    @Nullable
+    private final JetSingleValueToken token;
+
+    JetProjectionKind(@Nullable JetSingleValueToken token) {
+        this.token = token;
+    }
+
+    @Nullable
+    public JetSingleValueToken getToken() {
+        return token;
+    }
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java
index da61e550f48..f1710caa1ed 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java
@@ -18,6 +18,7 @@ package org.jetbrains.jet.lang.psi;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.stubs.PsiJetTypeProjectionStub;
@@ -42,12 +43,12 @@ public class JetTypeProjection extends JetModifierListOwnerStub<PsiJetTypeProjec
         }
 
         ASTNode projectionNode = getProjectionNode();
-        if (projectionNode == null) return JetProjectionKind.NONE;
-
-        if (projectionNode.getElementType() == JetTokens.IN_KEYWORD) return JetProjectionKind.IN;
-        if (projectionNode.getElementType() == JetTokens.OUT_KEYWORD) return JetProjectionKind.OUT;
-        if (projectionNode.getElementType() == JetTokens.MUL) return JetProjectionKind.STAR;
-
+        IElementType token = projectionNode != null ? projectionNode.getElementType() : null;
+        for (JetProjectionKind projectionKind : JetProjectionKind.values()) {
+            if (projectionKind.getToken() == token) {
+                return projectionKind;
+            }
+        }
         throw new IllegalStateException(projectionNode.getText());
     }