Add isAnnotation to class stub

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

@@ -154,6 +154,11 @@ public class JetClass extends JetTypeParameterListOwnerStub<PsiJetClassStub> imp
     }
 
     public boolean isAnnotation() {
+        PsiJetClassStub stub = getStub();
+        if (stub != null) {
+            return stub.isAnnotation();
+        }
+
         return hasModifier(JetTokens.ANNOTATION_KEYWORD);
     }
 

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

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

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

@@ -58,7 +58,7 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
         FqName fqName = JetPsiUtil.getFQName(psi);
         boolean isEnumEntry = psi instanceof JetEnumEntry;
         return new PsiJetClassStubImpl(getStubType(isEnumEntry), parentStub, fqName != null ? fqName.getFqName() : null, psi.getName(),
-                                       psi.getSuperNames(), psi.isTrait(), isEnumEntry);
+                                       psi.getSuperNames(), psi.isTrait(), isEnumEntry, psi.isAnnotation());
     }
 
     @Override
@@ -67,6 +67,7 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
         dataStream.writeName(stub.getQualifiedName());
         dataStream.writeBoolean(stub.isTrait());
         dataStream.writeBoolean(stub.isEnumEntry());
+        dataStream.writeBoolean(stub.isAnnotation());
 
         List<String> superNames = stub.getSuperNames();
         dataStream.writeVarInt(superNames.size());
@@ -81,6 +82,7 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
         StringRef qualifiedName = dataStream.readName();
         boolean isTrait = dataStream.readBoolean();
         boolean isEnumEntry = dataStream.readBoolean();
+        boolean isAnnotation = dataStream.readBoolean();
 
         int superCount = dataStream.readVarInt();
         StringRef[] superNames = StringRef.createArray(superCount);
@@ -88,7 +90,7 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
             superNames[i] = dataStream.readName();
         }
 
-        return new PsiJetClassStubImpl(getStubType(isEnumEntry), parentStub, qualifiedName, name, superNames, isTrait, isEnumEntry);
+        return new PsiJetClassStubImpl(getStubType(isEnumEntry), parentStub, qualifiedName, name, superNames, isTrait, isEnumEntry, isAnnotation);
     }
 
     @Override

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 = 14;
+    public static final int STUB_VERSION = 15;
 
     public JetFileElementType() {
         super("jet.FILE", JetLanguage.INSTANCE);

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

@@ -39,6 +39,7 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
     private final StringRef[] superNames;
     private final boolean isTrait;
     private final boolean isEnumEntry;
+    private final boolean isAnnotation;
 
     public PsiJetClassStubImpl(
             JetClassElementType type,
@@ -46,9 +47,9 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
             @Nullable final String qualifiedName,
             String name,
             List<String> superNames,
-            boolean isTrait, boolean isEnumEntry) {
+            boolean isTrait, boolean isEnumEntry, boolean isAnnotation) {
         this(type, parent, StringRef.fromString(qualifiedName), StringRef.fromString(name), wrapStrings(superNames),
-             isTrait, isEnumEntry);
+             isTrait, isEnumEntry, isAnnotation);
     }
 
     public PsiJetClassStubImpl(
@@ -57,14 +58,15 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
             StringRef qualifiedName,
             StringRef name,
             StringRef[] superNames,
-            boolean isTrait, boolean isEnumEntry
-    ) {
+            boolean isTrait, boolean isEnumEntry,
+            boolean isAnnotation) {
         super(parent, type);
         this.qualifiedName = qualifiedName;
         this.name = name;
         this.superNames = superNames;
         this.isTrait = isTrait;
         this.isEnumEntry = isEnumEntry;
+        this.isAnnotation = isAnnotation;
     }
 
     private static StringRef[] wrapStrings(List<String> names) {
@@ -85,6 +87,11 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
         return isTrait;
     }
 
+    @Override
+    public boolean isAnnotation() {
+        return isAnnotation;
+    }
+
     @Override
     public boolean isEnumEntry() {
         return isEnumEntry;
@@ -118,6 +125,10 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
             builder.append("trait ");
         }
 
+        if (isAnnotation()) {
+            builder.append("isAnnotation ");
+        }
+
         builder.append("name=").append(getName());
         builder.append(" fqn=").append(getQualifiedName());
         builder.append(" superNames=").append("[").append(StringUtil.join(ArrayUtil.toStringArray(getSuperNames()))).append("]");

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

@@ -129,6 +129,13 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
         );
     }
 
+    public void testAnnotationClass() {
+        doBuildTest("annotation class Test {}",
+                    "PsiJetFileStubImpl[package=]\n" +
+                    "  CLASS:PsiJetClassStubImpl[isAnnotation name=Test fqn=Test 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();