diff options
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 2 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTestJava.cpp | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index dfd880aa997..fdb1179b579 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1677,6 +1677,8 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line, Left.MatchingParen->Previous->is(tok::period)) // A.<B>DoSomething(); return false; + if (Left.Type == TT_TemplateCloser && Right.is(tok::l_square)) + return false; return true; } diff --git a/clang/unittests/Format/FormatTestJava.cpp b/clang/unittests/Format/FormatTestJava.cpp index eecac0f3fcd..d60ab965b9d 100644 --- a/clang/unittests/Format/FormatTestJava.cpp +++ b/clang/unittests/Format/FormatTestJava.cpp @@ -217,6 +217,9 @@ TEST_F(FormatTestJava, Generics) { verifyFormat("public static <R> ArrayList<R> get() {\n}"); verifyFormat("<T extends B> T getInstance(Class<T> type);"); verifyFormat("Function<F, ? extends T> function;"); + + verifyFormat("private Foo<X, Y>[] foos;"); + verifyFormat("Foo<X, Y>[] foos = this.foos;"); } TEST_F(FormatTestJava, StringConcatenation) { |
