Allow formatting relative to case statement, fix parsing of variable …

…declarations with array dimensions
Netflix-Skunkworks · Feb 18, 2020 · f294ba3 · f294ba3
1 parent d985bba
commit f294ba3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/rewrite-core/src/main/java/com/netflix/rewrite/parse/OpenJdkParserVisitor.java b/rewrite-core/src/main/java/com/netflix/rewrite/parse/OpenJdkParserVisitor.java
@@ -44,8 +44,7 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import static com.netflix.rewrite.tree.Formatting.EMPTY;
-import static com.netflix.rewrite.tree.Formatting.format;
+import static com.netflix.rewrite.tree.Formatting.*;
 import static com.netflix.rewrite.tree.Tr.AssignOp.Operator.*;
 import static com.netflix.rewrite.tree.Type.Primitive.Method;
 import static com.netflix.rewrite.tree.TypeUtils.asClass;
@@ -1166,12 +1165,19 @@ private Tr.VariableDecls visitVariables(List<VariableTree> nodes, Formatting fmt
 
             var namedVarPrefix = sourceBefore(n.getName().toString());
             JCVariableDecl vd = (JCVariableDecl) n;
+
+            var dimensionsAfterName = dimensions.get();
+            if(!dimensionsAfterName.isEmpty()) {
+                formatLastSuffix(dimensionsAfterName, vd.init != null ? sourceBefore("=") : "");
+            }
+
             var name = Tr.Ident.build(randomId(), n.getName().toString(), type(node),
-                    format("", (vd.init != null) ? sourceBefore("=") : ""));
+                    format("", (dimensionsAfterName.isEmpty() && vd.init != null) ? sourceBefore("=") : ""));
+
             vars.add(
                     new Tr.VariableDecls.NamedVar(randomId(),
                             name,
-                            dimensions.get(),
+                            dimensionsAfterName,
                             convertOrNull(vd.init),
                             type(n),
                             i == nodes.size() - 1 ? format(namedVarPrefix) : format(namedVarPrefix, sourceBefore(","))

diff --git a/rewrite-core/src/main/java/com/netflix/rewrite/tree/Tr.java b/rewrite-core/src/main/java/com/netflix/rewrite/tree/Tr.java
@@ -2787,6 +2787,7 @@ public static class NamedVar extends Tr {
             @With
             Ident name;
 
+            @With
             List<Dimension> dimensionsAfterName;
 
             @With

diff --git a/rewrite-core/src/main/java/com/netflix/rewrite/tree/visitor/refactor/Formatter.java b/rewrite-core/src/main/java/com/netflix/rewrite/tree/visitor/refactor/Formatter.java
@@ -84,8 +84,16 @@ public Result findIndent(int enclosingIndent, Tree... trees) {
         return new Result(enclosingIndent, indentToUse, indentedWithSpaces);
     }
 
-    public Formatting format(Tr.Block<?> relativeToEnclosing) {
-        Result indentation = findIndent(relativeToEnclosing.getIndent(), relativeToEnclosing.getStatements().toArray(Tree[]::new));
+    public Formatting format(Tree relativeToEnclosing) {
+        Tree[] siblings = new Tree[0];
+        if(relativeToEnclosing instanceof Tr.Block) {
+            siblings = ((Tr.Block<?>) relativeToEnclosing).getStatements().toArray(Tree[]::new);
+        }
+        else if(relativeToEnclosing instanceof Tr.Case) {
+            siblings = ((Tr.Case) relativeToEnclosing).getStatements().toArray(Tree[]::new);
+        }
+
+        Result indentation = findIndent(enclosingIndent(relativeToEnclosing), siblings);
         return Formatting.format(indentation.getPrefix());
     }