Stub for enum entry

compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java

@@ -38,7 +38,7 @@ public interface JetNodeTypes {
 
     JetNodeType CLASS_OBJECT          = new JetNodeType("CLASS_OBJECT", JetClassObject.class);
     JetNodeType CONSTRUCTOR           = new JetNodeType("CONSTRUCTOR", JetSecondaryConstructor.class);
-    JetNodeType ENUM_ENTRY            = new JetNodeType("ENUM_ENTRY", JetEnumEntry.class);
+    IElementType ENUM_ENTRY            = JetStubElementTypes.ENUM_ENTRY;
     JetNodeType ANONYMOUS_INITIALIZER = new JetNodeType("ANONYMOUS_INITIALIZER", JetClassInitializer.class);
 
     IElementType TYPE_PARAMETER_LIST                 = JetStubElementTypes.TYPE_PARAMETER_LIST;

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java

@@ -18,10 +18,13 @@ package org.jetbrains.jet.lang.psi;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetNodeTypes;
+import org.jetbrains.jet.lang.psi.stubs.PsiJetClassStub;
+import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
 
 import java.util.Collections;
 import java.util.List;
@@ -34,8 +37,17 @@ public class JetEnumEntry extends JetClass {
         super(node);
     }
 
+    public JetEnumEntry(@NotNull PsiJetClassStub stub) {
+        super(stub);
+    }
+
     @Override
     public String getName() {
+        PsiJetClassStub classStub = getStub();
+        if (classStub != null) {
+            return classStub.getName();
+        }
+
         JetObjectDeclarationName nameAsDeclaration = getNameAsDeclaration();
         return nameAsDeclaration == null ? "<Anonymous>" : nameAsDeclaration.getName();
     }
@@ -46,6 +58,12 @@ public class JetEnumEntry extends JetClass {
         return nameAsDeclaration == null ? null : nameAsDeclaration.getNameIdentifier();
     }
 
+    @NotNull
+    @Override
+    public IStubElementType getElementType() {
+        return JetStubElementTypes.ENUM_ENTRY;
+    }
+
     @Override
     public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException {
         JetObjectDeclarationName nameAsDeclaration = getNameAsDeclaration();

compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetClassStub.java

@@ -34,6 +34,8 @@ public interface PsiJetClassStub extends NamedStub<JetClass> {
 
     boolean isTrait();
 
+    boolean isEnumEntry();
+
     @NotNull
     List<String> getSuperNames();
 }

compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetClassElementType.java

@@ -25,6 +25,7 @@ import com.intellij.util.io.StringRef;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetClass;
+import org.jetbrains.jet.lang.psi.JetEnumEntry;
 import org.jetbrains.jet.lang.psi.JetPsiUtil;
 import org.jetbrains.jet.lang.psi.stubs.PsiJetClassStub;
 import org.jetbrains.jet.lang.psi.stubs.impl.PsiJetClassStubImpl;
@@ -44,19 +45,20 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
 
     @Override
     public JetClass createPsi(@NotNull PsiJetClassStub stub) {
-        return new JetClass(stub);
+        return !stub.isEnumEntry() ? new JetClass(stub) : new JetEnumEntry(stub);
     }
 
     @Override
     public JetClass createPsiFromAst(@NotNull ASTNode node) {
-        return new JetClass(node);
+        return node.getElementType() != JetStubElementTypes.ENUM_ENTRY ? new JetClass(node) : new JetEnumEntry(node);
     }
 
     @Override
     public PsiJetClassStub createStub(@NotNull JetClass psi, StubElement parentStub) {
         FqName fqName = JetPsiUtil.getFQName(psi);
-        return new PsiJetClassStubImpl(JetStubElementTypes.CLASS, parentStub, fqName != null ? fqName.getFqName() : null, psi.getName(),
+        boolean isEnumEntry = psi instanceof JetEnumEntry;
-                                       psi.getSuperNames(), psi.isTrait());
+        return new PsiJetClassStubImpl(getStubType(isEnumEntry), parentStub, fqName != null ? fqName.getFqName() : null, psi.getName(),
+                                       psi.getSuperNames(), psi.isTrait(), isEnumEntry);
     }
 
     @Override
@@ -64,6 +66,7 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
         dataStream.writeName(stub.getName());
         dataStream.writeName(stub.getQualifiedName());
         dataStream.writeBoolean(stub.isTrait());
+        dataStream.writeBoolean(stub.isEnumEntry());
 
         List<String> superNames = stub.getSuperNames();
         dataStream.writeVarInt(superNames.size());
@@ -77,6 +80,7 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
         StringRef name = dataStream.readName();
         StringRef qualifiedName = dataStream.readName();
         boolean isTrait = dataStream.readBoolean();
+        boolean isEnumEntry = dataStream.readBoolean();
 
         int superCount = dataStream.readVarInt();
         StringRef[] superNames = StringRef.createArray(superCount);
@@ -84,11 +88,15 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
             superNames[i] = dataStream.readName();
         }
 
-        return new PsiJetClassStubImpl(JetStubElementTypes.CLASS, parentStub, qualifiedName, name, superNames, isTrait);
+        return new PsiJetClassStubImpl(getStubType(isEnumEntry), parentStub, qualifiedName, name, superNames, isTrait, isEnumEntry);
     }
 
     @Override
     public void indexStub(PsiJetClassStub stub, IndexSink sink) {
         StubIndexServiceFactory.getInstance().indexClass(stub, sink);
     }
+
+    private static JetClassElementType getStubType(boolean isEnumEntry) {
+        return isEnumEntry ? JetStubElementTypes.ENUM_ENTRY : JetStubElementTypes.CLASS;
+    }
 }

compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java

@@ -38,7 +38,7 @@ import java.io.IOException;
  * @author Nikolay Krasko
  */
 public class JetFileElementType extends IStubFileElementType<PsiJetFileStub> {
-    public static final int STUB_VERSION = 13;
+    public static final int STUB_VERSION = 14;
 
     public JetFileElementType() {
         super("jet.FILE", JetLanguage.INSTANCE);

compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementTypes.java

@@ -25,6 +25,7 @@ public interface JetStubElementTypes {
     JetClassElementType CLASS = new JetClassElementType("CLASS");
     JetFunctionElementType FUNCTION = new JetFunctionElementType("FUN");
     JetPropertyElementType PROPERTY = new JetPropertyElementType("PROPERTY");
+    JetClassElementType ENUM_ENTRY = new JetClassElementType("ENUM_ENTRY");
 
     JetParameterElementType VALUE_PARAMETER = new JetParameterElementType("VALUE_PARAMETER");
     JetParameterListElementType VALUE_PARAMETER_LIST = new JetParameterListElementType("VALUE_PARAMETER_LIST");

compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetClassStubImpl.java

@@ -34,11 +34,11 @@ import java.util.List;
  * @author Nikolay Krasko
  */
 public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetClassStub {
-
     private final StringRef qualifiedName;
     private final StringRef name;
     private final StringRef[] superNames;
     private final boolean isTrait;
+    private final boolean isEnumEntry;
 
     public PsiJetClassStubImpl(
             JetClassElementType type,
@@ -46,8 +46,25 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
             @Nullable final String qualifiedName,
             String name,
             List<String> superNames,
-            boolean isTrait) {
+            boolean isTrait, boolean isEnumEntry) {
-        this(type, parent, StringRef.fromString(qualifiedName), StringRef.fromString(name), wrapStrings(superNames), isTrait);
+        this(type, parent, StringRef.fromString(qualifiedName), StringRef.fromString(name), wrapStrings(superNames),
+             isTrait, isEnumEntry);
+    }
+
+    public PsiJetClassStubImpl(
+            JetClassElementType type,
+            StubElement parent,
+            StringRef qualifiedName,
+            StringRef name,
+            StringRef[] superNames,
+            boolean isTrait, boolean isEnumEntry
+    ) {
+        super(parent, type);
+        this.qualifiedName = qualifiedName;
+        this.name = name;
+        this.superNames = superNames;
+        this.isTrait = isTrait;
+        this.isEnumEntry = isEnumEntry;
     }
 
     private static StringRef[] wrapStrings(List<String> names) {
@@ -58,21 +75,6 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
         return refs;
     }
 
-    public PsiJetClassStubImpl(
-            JetClassElementType type,
-            StubElement parent,
-            StringRef qualifiedName,
-            StringRef name,
-            StringRef[] superNames,
-            boolean isTrait) {
-
-        super(parent, type);
-        this.qualifiedName = qualifiedName;
-        this.name = name;
-        this.superNames = superNames;
-        this.isTrait = isTrait;
-    }
-
     @Override
     public String getQualifiedName() {
         return StringRef.toString(qualifiedName);
@@ -83,6 +85,11 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
         return isTrait;
     }
 
+    @Override
+    public boolean isEnumEntry() {
+        return isEnumEntry;
+    }
+
     @Override
     public String getName() {
         return StringRef.toString(name);
@@ -103,6 +110,10 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
         StringBuilder builder = new StringBuilder();
         builder.append("PsiJetClassStubImpl[");
 
+        if (isEnumEntry()) {
+            builder.append("enumEntry ");
+        }
+
         if (isTrait()) {
             builder.append("trait ");
         }

idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java

@@ -91,6 +91,18 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
                     "    VALUE_PARAMETER_LIST:PsiJetParameterListStubImpl\n");
     }
 
+    public void testSimpleEnumBuild() {
+        doBuildTest("enum class Test { First\n Second\n }",
+                    "PsiJetFileStubImpl[package=]\n" +
+                    "  CLASS:PsiJetClassStubImpl[name=Test fqn=Test superNames=[]]\n" +
+                    "    TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n" +
+                    "    ENUM_ENTRY:PsiJetClassStubImpl[enumEntry name=First fqn=Test.First superNames=[]]\n" +
+                    "      TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n" +
+                    "    ENUM_ENTRY:PsiJetClassStubImpl[enumEntry name=Second fqn=Test.Second superNames=[]]\n" +
+                    "      TYPE_PARAMETER_LIST:PsiJetTypeParameterListStubImpl\n"
+        );
+    }
+
     private void doBuildTest(@NonNls final String source, @NonNls @NotNull final String tree) {
         final JetFile file = (JetFile) createLightFile(JetFileType.INSTANCE, source);
         final FileASTNode fileNode = file.getNode();