Unify breaks between type parameters

cushon · ronshapiro · commit 8e6fbbbbf6e5 · 2018-01-29T14:45:06.000-05:00
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=183326714
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -1530,8 +1530,7 @@ public Void visitParameterizedType(ParameterizedTypeTree node, Void unused) {
       for (Tree typeArgument : node.getTypeArguments()) {
         if (!first) {
           token(",");
-          // TODO(cushon): unify breaks
-          builder.breakToFill(" ");
+          builder.breakOp(" ");
         }
         scan(typeArgument, null);
         first = false;
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20128760.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B20128760.output
@@ -82,7 +82,8 @@ class B20128760 {
   public class Foo
       extends Xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
       implements Xxxxxxxxxxxxx<
-              Xxxxxxxxxxxxxxxxxxxxxxxxxxxxx, Xxxxxxxxxxxxxxxxxxxxxxxxxxxxx,
+              Xxxxxxxxxxxxxxxxxxxxxxxxxxxxx,
+              Xxxxxxxxxxxxxxxxxxxxxxxxxxxxx,
               Xxxxxxxxxxxxxxxxxxxxxxxxxxxxx>,
           Xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx {}
 
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B72507902.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B72507902.input
@@ -0,0 +1,6 @@
+class B72507902 {
+  private static class Xxxxxxxxxxxxxxxxxxxx
+      extends Xxxxxxxxxxx<
+          Pair<xxxxxxxxxxxxxxxxxxx, Xxxxxxxxxx<Xxxxxxxxx>>, Xxxxxxxxxxxxxxxxxxxx,
+          List<Xxxxxxxxx>> {}
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/B72507902.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/B72507902.output
@@ -0,0 +1,7 @@
+class B72507902 {
+  private static class Xxxxxxxxxxxxxxxxxxxx
+      extends Xxxxxxxxxxx<
+          Pair<xxxxxxxxxxxxxxxxxxx, Xxxxxxxxxx<Xxxxxxxxx>>,
+          Xxxxxxxxxxxxxxxxxxxx,
+          List<Xxxxxxxxx>> {}
+}
