Fix formatting of module trees

after https://bugs.openjdk.java.net/browse/JDK-8255464 PiperOrigin-RevId: 378545281
palantir · Dec 13, 2021 · 594b187 · 594b187
1 parent 3215d79
commit 594b187
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java b/palantir-java-format/src/main/java/com/palantir/javaformat/java/JavaInputAstVisitor.java
@@ -384,11 +384,14 @@ public Void visitCompilationUnit(CompilationUnitTree node, Void unused) {
             first = false;
             dropEmptyDeclarations();
         }
+        handleModule(first, node);
         // set a partial format marker at EOF to make sure we can format the entire file
         markForPartialFormat();
         return null;
     }
 
+    protected void handleModule(boolean first, CompilationUnitTree node) {}
+
     /** Skips over extra semi-colons at the top-level, or in a class member declaration lists. */
     protected void dropEmptyDeclarations() {
         if (builder.peekToken().equals(Optional.of(";"))) {

diff --git a/...-java-format/src/main/java/com/palantir/javaformat/java/java14/Java14InputAstVisitor.java b/...-java-format/src/main/java/com/palantir/javaformat/java/java14/Java14InputAstVisitor.java
@@ -24,14 +24,17 @@
 import com.google.common.collect.ImmutableList;
 import com.palantir.javaformat.Op;
 import com.palantir.javaformat.OpsBuilder;
+import com.palantir.javaformat.OpsBuilder.BlankLineWanted;
 import com.palantir.javaformat.java.JavaInputAstVisitor;
 import com.sun.source.tree.BindingPatternTree;
 import com.sun.source.tree.BlockTree;
 import com.sun.source.tree.CaseTree;
 import com.sun.source.tree.ClassTree;
+import com.sun.source.tree.CompilationUnitTree;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.InstanceOfTree;
 import com.sun.source.tree.LambdaExpressionTree;
+import com.sun.source.tree.ModuleTree;
 import com.sun.source.tree.SwitchExpressionTree;
 import com.sun.source.tree.Tree;
 import com.sun.source.tree.Tree.Kind;
@@ -53,6 +56,24 @@ public Java14InputAstVisitor(OpsBuilder builder, int indentMultiplier) {
         super(builder, indentMultiplier);
     }
 
+    @Override
+    protected void handleModule(boolean first, CompilationUnitTree node) {
+        try {
+            ModuleTree module = (ModuleTree)
+                    CompilationUnitTree.class.getMethod("getModule").invoke(node);
+            if (module != null) {
+                if (!first) {
+                    builder.blankLineWanted(BlankLineWanted.YES);
+                }
+                markForPartialFormat();
+                visitModule(module, null);
+                builder.forcedBreak();
+            }
+        } catch (ReflectiveOperationException e) {
+            // Java < 17, see https://bugs.openjdk.java.net/browse/JDK-8255464
+        }
+    }
+
     @Override
     public Void visitBindingPattern(BindingPatternTree node, Void unused) {
         sync(node);