diff options
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 3 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTestJava.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 104eb1d7afb..74fb0f7a727 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1696,7 +1696,8 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line, } else if (Style.Language == FormatStyle::LK_Java) { 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) && + if (Left.isOneOf(tok::kw_static, tok::kw_public, tok::kw_private, + tok::kw_protected) && Right.Type == TT_TemplateOpener) return true; } diff --git a/clang/unittests/Format/FormatTestJava.cpp b/clang/unittests/Format/FormatTestJava.cpp index 6523c86f526..eecac0f3fcd 100644 --- a/clang/unittests/Format/FormatTestJava.cpp +++ b/clang/unittests/Format/FormatTestJava.cpp @@ -212,6 +212,8 @@ TEST_F(FormatTestJava, Generics) { "public Map<String, ?> getAll() {\n}"); verifyFormat("public <R> ArrayList<R> get() {\n}"); + verifyFormat("protected <R> ArrayList<R> get() {\n}"); + verifyFormat("private <R> ArrayList<R> get() {\n}"); verifyFormat("public static <R> ArrayList<R> get() {\n}"); verifyFormat("<T extends B> T getInstance(Class<T> type);"); verifyFormat("Function<F, ? extends T> function;"); |
