'@' followed by any keyword can't be an annotation, but @interface is currently
the only combination of '@' and a keyword that's allowed, so limit it to this
case. `@interface Foo` without a leading `public` was misformatted prior to
this patch.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@221607
91177308-0d34-0410-b5e6-
96231b3b80d8
bool isNot(T Kind) const {
return Tok.isNot(Kind);
}
+ bool isNot(IdentifierInfo *II) const { return II != Tok.getIdentifierInfo(); }
bool isStringLiteral() const { return tok::isStringLiteral(Tok.getKind()); }
kw_extends = &IdentTable.get("extends");
kw_implements = &IdentTable.get("implements");
+ kw_interface = &IdentTable.get("interface");
kw_synchronized = &IdentTable.get("synchronized");
kw_throws = &IdentTable.get("throws");
// Java keywords.
IdentifierInfo *kw_extends;
IdentifierInfo *kw_implements;
+ IdentifierInfo *kw_interface;
IdentifierInfo *kw_synchronized;
IdentifierInfo *kw_throws;
// function declaration have been found.
Current.Type = TT_TrailingAnnotation;
} else if (Style.Language == FormatStyle::LK_Java && Current.Previous &&
- Current.Previous->is(tok::at)) {
+ Current.Previous->is(tok::at) &&
+ Current.isNot(Keywords.kw_interface)) {
const FormatToken& AtToken = *Current.Previous;
if (!AtToken.Previous ||
AtToken.Previous->Type == TT_LeadingJavaAnnotation)
" implements cccccccccccc {\n"
"}",
getStyleWithColumns(76));
+ verifyFormat("interface SomeInterface<A> extends Foo, Bar {\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("@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"
+ "}");
}
TEST_F(FormatTestJava, EnumDeclarations) {