Merge pull request #69 from openjavaformat/tabular-mixed-sign-initializer

Keep a tabular array initializer with mixed signs in rows

Author: abashev

open-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java

@@ -3483,7 +3483,13 @@ private static boolean expressionsAreParallel(List<List<ExpressionTree>> rows, i
             if (column >= row.size()) {
                 continue;
             }
-            nodeTypes.add(row.get(column).getKind());
+            // Treat UnaryTree expressions as their underlying type for the comparison (so, for example
+            // -ve and +ve numeric literals are considered the same).
+            if (row.get(column) instanceof UnaryTree) {
+                nodeTypes.add(((UnaryTree) row.get(column)).getExpression().getKind());
+            } else {
+                nodeTypes.add(row.get(column).getKind());
+            }
         }
         for (Multiset.Entry<Tree.Kind> nodeType : nodeTypes.entrySet()) {
             if (nodeType.getCount() >= atLeastM) {

open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/TabularMixedSignInitializer.input

@@ -0,0 +1,17 @@
+public class T {
+  private static final double[] f = {
+    95.0, 75.0, -95.0, 75.0,
+    -95.0, 75.0, +95.0, 75.0
+  };
+
+  private static final int[] g = {
+    x++, y, ++z,
+    x, y, ~z,
+    --x, ++y, z--
+  };
+
+  private static final bool[] h = {
+    a, b, c, d,
+    !e, a, b, c
+  };
+}

open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/TabularMixedSignInitializer.output

@@ -0,0 +1,17 @@
+public class T {
+    private static final double[] f = {
+        95.0, 75.0, -95.0, 75.0,
+        -95.0, 75.0, +95.0, 75.0
+    };
+
+    private static final int[] g = {
+        x++, y, ++z,
+        x, y, ~z,
+        --x, ++y, z--
+    };
+
+    private static final bool[] h = {
+        a, b, c, d,
+        !e, a, b, c
+    };
+}