Java annotation declaration being handled correctly

[SamMaier]

Summary

Previously, Java annotation declarations (@interface AnnotationName) were being handled as ObjC interfaces. This caused the brace formatting to mess up, so that when you had a class with an interface defined in it, it would indent the final brace of the class.

It used to format this class like so:

class A {
  @interface B {}
  }

But will now just skip the @interface and format it like so:

class A {
  @interface B {}
}

[thakis]

Thanks for the fix! Do you happen to know what had regressed this?

cfe/trunk/lib/Format/UnwrappedLineParser.cpp

do {
     const FormatToken *Previous = FormatTok->Previous;
     switch (FormatTok->Tok.getKind()) {
     case tok::at:
       nextToken();
       if (FormatTok->Tok.is(tok::l_brace)) {
         nextToken();
         parseBracedList();
         break;
+      } else if (Style.Language == FormatStyle::LK_Java &&
+                 FormatTok->is(Keywords.kw_interface)) {
+        nextToken();
+        break;
       }
       switch (FormatTok->Tok.getObjCKeywordID()) {
       case tok::objc_public:
       case tok::objc_protected:
       case tok::objc_package:
       case tok::objc_private:
         return parseAccessSpecifier();
       case tok::objc_interface:

cfe/trunk/unittests/Format/FormatTestJava.cpp

TEST_F(FormatTestJava, ClassDeclarations) {
   verifyFormat("@interface SomeInterface {\n"
                "  void doStuff(int theStuff);\n"
                "  void doMoreStuff(int moreStuff);\n"
                "}");
   verifyFormat("public @interface SomeInterface {\n"
                "  void doStuff(int theStuff);\n"
                "  void doMoreStuff(int moreStuff);\n"
                "}");
+  verifyFormat("class A {\n"
+               "  public @interface SomeInterface {\n"
+               "    int stuff;\n"
+               "    void doMoreStuff(int moreStuff);\n"
+               "  }\n"
+               "}");
+  verifyFormat("class A {\n"
+               "  public @interface SomeInterface {}\n"
+               "}");
 }
 
 TEST_F(FormatTestJava, AnonymousClasses) {
   verifyFormat("return new A() {\n"
                "  public String toString() {\n"
                "    return \"NotReallyA\";\n"
                "  }\n"
                "};");