clang-format: Fix space between generic type parameter and square

bracket

Before:
  public Foo<X, Y> [] foos;

After:
  public Foo<X, Y>[] foos;

Patch by Harry Terkelsen. Thank you!

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@222283 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index dfd880aa99746a53bdbac69f474716c4b027b42d..fdb1179b5799509842e26b345fcc369d06711f4d 100644 (file)
--- a/lib/Format/TokenAnnotator.cpp
+++ b/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/unittests/Format/FormatTestJava.cpp b/unittests/Format/FormatTestJava.cpp
index eecac0f3fcd05c9e2b01dfa437c638274bcaceb7..d60ab965b9dd28cfc976fb93a072aaf28717d8d1 100644 (file)
--- a/unittests/Format/FormatTestJava.cpp
+++ b/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) {