From 77a6b4444b4a922c01573922980f47c4c2691481 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 2 Apr 2014 15:57:43 +0400
Subject: [PATCH] Add missing types to DECLARATION_TYPES and move to
 JetStubElementTypes

---
 .../src/org/jetbrains/jet/lang/psi/JetClassBody.java   | 10 ++++------
 .../lang/psi/stubs/elements/JetStubElementTypes.java   |  4 ++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java
index 6e3683215b4..4a730010297 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java
@@ -23,23 +23,21 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetNodeTypes;
 import org.jetbrains.jet.lang.psi.stubs.PsiJetPlaceHolderStub;
-import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
 import org.jetbrains.jet.lexer.JetTokens;
 
 import java.util.Arrays;
 import java.util.List;
 
+import static org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes.*;
+
 public class JetClassBody extends JetElementImplStub<PsiJetPlaceHolderStub<JetClassBody>> implements JetDeclarationContainer {
-    private static final TokenSet DECLARATION_TYPES =
-            TokenSet.create(JetStubElementTypes.CLASS, JetStubElementTypes.OBJECT_DECLARATION, JetStubElementTypes.CLASS_OBJECT,
-                            JetStubElementTypes.FUNCTION, JetStubElementTypes.PROPERTY);
 
     public JetClassBody(@NotNull ASTNode node) {
         super(node);
     }
 
     public JetClassBody(@NotNull PsiJetPlaceHolderStub<JetClassBody> stub) {
-        super(stub, JetStubElementTypes.CLASS_BODY);
+        super(stub, CLASS_BODY);
     }
 
     @Override
@@ -65,7 +63,7 @@ public class JetClassBody extends JetElementImplStub<PsiJetPlaceHolderStub<JetCl
 
     @Nullable
     public JetClassObject getClassObject() {
-        return getStubOrPsiChild(JetStubElementTypes.CLASS_OBJECT);
+        return getStubOrPsiChild(CLASS_OBJECT);
     }
 
     @NotNull
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementTypes.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementTypes.java
index 6993204b306..dd90b503e96 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementTypes.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementTypes.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.lang.psi.stubs.elements;
 
+import com.intellij.psi.tree.TokenSet;
 import org.jetbrains.jet.lang.psi.*;
 
 public interface JetStubElementTypes {
@@ -84,4 +85,7 @@ public interface JetStubElementTypes {
 
     JetPlaceHolderStubElementType<JetDelegationSpecifierList> DELEGATION_SPECIFIER_LIST =
             new JetPlaceHolderStubElementType<JetDelegationSpecifierList>("DELEGATION_SPECIFIER_LIST", JetDelegationSpecifierList.class);
+    
+    TokenSet DECLARATION_TYPES =
+              TokenSet.create(CLASS, OBJECT_DECLARATION, CLASS_OBJECT, FUNCTION, PROPERTY, ANONYMOUS_INITIALIZER, ENUM_ENTRY);
 }