New Java parser (incomplete class declaration parsing fixed)

java/java-impl/src/com/intellij/lang/java/parser/DeclarationParser.java

@@ -246,7 +246,8 @@ public class DeclarationParser {
 
     if (expect(builder, JavaTokenType.AT)) {
       if (builder.getTokenType() == JavaTokenType.INTERFACE_KEYWORD) {
-        return parseClassFromKeyword(builder, declaration, true, context);
+        final PsiBuilder.Marker result = parseClassFromKeyword(builder, declaration, true, context);
+        return result != null ? result : modList;
       }
       else {
         declaration.rollbackTo();

java/java-tests/testData/psi/parser-full/declarationParsing/class/Errors2.java

@@ -0,0 +1,3 @@
+public class Main {
+@interface <caret>
+}

java/java-tests/testData/psi/parser-full/declarationParsing/class/Errors2.txt

@@ -0,0 +1,38 @@
+PsiJavaFile:Errors2.java
+  PsiImportList
+    <empty list>
+  PsiClass:Main
+    PsiModifierList:public
+      PsiKeyword:public('public')
+    PsiWhiteSpace(' ')
+    PsiKeyword:class('class')
+    PsiWhiteSpace(' ')
+    PsiIdentifier:Main('Main')
+    PsiTypeParameterList
+      <empty list>
+    PsiReferenceList
+      <empty list>
+    PsiReferenceList
+      <empty list>
+    PsiWhiteSpace(' ')
+    PsiJavaToken:LBRACE('{')
+    PsiWhiteSpace('\n')
+    PsiModifierList:
+      <empty list>
+    PsiJavaToken:AT('@')
+    PsiKeyword:interface('interface')
+    PsiErrorElement:Identifier expected
+      <empty list>
+    PsiWhiteSpace(' ')
+    PsiModifierList:
+      <empty list>
+    PsiErrorElement:Identifier or type expected
+      PsiTypeParameterList
+        PsiJavaToken:LT('<')
+        PsiTypeParameter:caret
+          PsiIdentifier:caret('caret')
+          PsiElement(EXTENDS_BOUND_LIST)
+            <empty list>
+        PsiJavaToken:GT('>')
+    PsiWhiteSpace('\n')
+    PsiJavaToken:RBRACE('}')

java/java-tests/testSrc/com/intellij/lang/java/parser/declarationParsing/ClassParsingTest.java

@@ -39,4 +39,5 @@ public class ClassParsingTest extends JavaParsingTestCase {
 
   public void testErrors0() { doTest(true); }
   public void testErrors1() { doTest(true); }
+  public void testErrors2() { doTest(true); }
 }