Merge pull request #68 from openjavaformat/semicolon-only-class-body

Format a class body that holds nothing but semicolons

Author: abashev

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

@@ -3811,6 +3811,14 @@ private void addBodyDeclarations(
                 tokenBreakTrailingComment("{", plusTwo);
                 builder.blankLineWanted(BlankLineWanted.NO);
                 builder.open(ZERO);
+                if (builder.peekToken().equals(Optional.of(";"))) {
+                    // A body with nothing but stray semicolons: javac drops them, so the member list is empty, but
+                    // the tokens are still there and have to be written out, one per line at the member indent.
+                    builder.open(memberIndent);
+                    dropEmptyDeclarations();
+                    builder.close();
+                    builder.forcedBreak();
+                }
                 token("}", plusTwo);
                 builder.close();
             }

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

@@ -0,0 +1,3 @@
+class SemicolonInClass {
+  ;
+}

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

@@ -0,0 +1,3 @@
+class SemicolonInClass {
+    ;
+}

open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/ojf-semicolon-only-body.input

@@ -0,0 +1,13 @@
+interface B { ; }
+enum C { X; ; }
+record R(int a) { ; }
+class E { ;; }
+class F { Object o = new Object() { ; }; }
+class G { // comment
+  ;
+}
+@interface H { ; }
+class I {
+  ;
+  int x;
+}

open-java-format/src/test/resources/com/palantir/javaformat/java/testdata/ojf-semicolon-only-body.output

@@ -0,0 +1,36 @@
+interface B {
+    ;
+}
+
+enum C {
+    X;
+    ;
+}
+
+record R(int a) {
+    ;
+}
+
+class E {
+    ;
+    ;
+}
+
+class F {
+    Object o = new Object() {
+        ;
+    };
+}
+
+class G { // comment
+    ;
+}
+
+@interface H {
+    ;
+}
+
+class I {
+    ;
+    int x;
+}