clang-format: [Java] Support more Java keywords.
Before: public final<X> Foo foo() { } public abstract<X> Foo foo(); After: public final <X> Foo foo() { } public abstract <X> Foo foo(); Patch by Harry Terkelsen. Thank you. llvm-svn: 222527
This commit is contained in:
parent
43419a74ac
commit
82c9275344
|
@ -546,7 +546,9 @@ struct AdditionalKeywords {
|
|||
kw_function = &IdentTable.get("function");
|
||||
kw_var = &IdentTable.get("var");
|
||||
|
||||
kw_abstract = &IdentTable.get("abstract");
|
||||
kw_extends = &IdentTable.get("extends");
|
||||
kw_final = &IdentTable.get("final");
|
||||
kw_implements = &IdentTable.get("implements");
|
||||
kw_interface = &IdentTable.get("interface");
|
||||
kw_synchronized = &IdentTable.get("synchronized");
|
||||
|
@ -569,7 +571,9 @@ struct AdditionalKeywords {
|
|||
IdentifierInfo *kw_var;
|
||||
|
||||
// Java keywords.
|
||||
IdentifierInfo *kw_abstract;
|
||||
IdentifierInfo *kw_extends;
|
||||
IdentifierInfo *kw_final;
|
||||
IdentifierInfo *kw_implements;
|
||||
IdentifierInfo *kw_interface;
|
||||
IdentifierInfo *kw_synchronized;
|
||||
|
|
|
@ -1710,8 +1710,9 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
|
|||
return true;
|
||||
if (Left.is(Keywords.kw_synchronized) && Right.is(tok::l_paren))
|
||||
return Style.SpaceBeforeParens != FormatStyle::SBPO_Never;
|
||||
if (Left.isOneOf(tok::kw_static, tok::kw_public, tok::kw_private,
|
||||
tok::kw_protected) &&
|
||||
if ((Left.isOneOf(tok::kw_static, tok::kw_public, tok::kw_private,
|
||||
tok::kw_protected) ||
|
||||
Left.isOneOf(Keywords.kw_final, Keywords.kw_abstract)) &&
|
||||
Right.Type == TT_TemplateOpener)
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -229,6 +229,8 @@ TEST_F(FormatTestJava, Generics) {
|
|||
verifyFormat("protected <R> ArrayList<R> get() {\n}");
|
||||
verifyFormat("private <R> ArrayList<R> get() {\n}");
|
||||
verifyFormat("public static <R> ArrayList<R> get() {\n}");
|
||||
verifyFormat("public final <X> Foo foo() {\n}");
|
||||
verifyFormat("public abstract <X> Foo foo();");
|
||||
verifyFormat("<T extends B> T getInstance(Class<T> type);");
|
||||
verifyFormat("Function<F, ? extends T> function;");
|
||||
|
||||
|
|
Loading…
Reference in New Issue