Merge pull request #398 from Shaolans/fix-271

fix: enforce blank line after body declaration

Author: pascalgrimaud

packages/prettier-plugin-java/scripts/single-printer-run/_output.java

@@ -1,9 +1,13 @@
 public enum Enum {
-  SOME_ENUM, ANOTHER_ENUM, LAST_ENUM;
+  SOME_ENUM,
+  ANOTHER_ENUM,
+  LAST_ENUM,
 }
 
 public enum Enum {
-  THIS_IS_GOOD("abc"), THIS_IS_FINE("abc");
+  THIS_IS_GOOD("abc"),
+  THIS_IS_FINE("abc");
+
   public static final String thisWillBeDeleted = "DELETED";
 
   private final String value;
@@ -20,6 +24,7 @@ public String toString() {
 class CLassWithEnum {
 
   public static enum VALID_THINGS {
-    FIRST, SECOND;
+    FIRST,
+    SECOND,
   }
 }

packages/prettier-plugin-java/src/printers/classes.js

@@ -43,7 +43,7 @@ class ClassesPrettierVisitor {
     const optionalTypeParams = this.visit(ctx.typeParameters);
     const optionalSuperClasses = this.visit(ctx.superclass);
     const optionalSuperInterfaces = this.visit(ctx.superinterfaces);
-    const body = this.visit(ctx.classBody);
+    const body = this.visit(ctx.classBody, { isNormalClassDeclaration: true });
 
     let superClassesPart = "";
     if (optionalSuperClasses) {
@@ -113,7 +113,7 @@ class ClassesPrettierVisitor {
     return group(rejectAndJoinSeps(commas, interfaceType));
   }
 
-  classBody(ctx) {
+  classBody(ctx, param) {
     let content = "";
     if (ctx.classBodyDeclaration !== undefined) {
       const classBodyDeclsVisited = reject(
@@ -126,15 +126,24 @@ class ClassesPrettierVisitor {
 
       content = rejectAndJoinSeps(separators, classBodyDeclsVisited);
 
+      // edge case when we have SemiColons
+      let shouldHardline = false;
+      ctx.classBodyDeclaration.forEach(elt => {
+        if (
+          (elt.children.classMemberDeclaration &&
+            !elt.children.classMemberDeclaration[0].children.Semicolon) ||
+          elt.children.constructorDeclaration
+        ) {
+          shouldHardline = true;
+        }
+      });
+
       if (
-        !(
-          ctx.classBodyDeclaration[0].children.classMemberDeclaration !==
-            undefined &&
-          (ctx.classBodyDeclaration[0].children.classMemberDeclaration[0]
-            .children.fieldDeclaration !== undefined ||
-            ctx.classBodyDeclaration[0].children.classMemberDeclaration[0]
-              .children.Semicolon !== undefined)
-        )
+        (ctx.classBodyDeclaration[0].children.classMemberDeclaration ||
+          ctx.classBodyDeclaration[0].children.constructorDeclaration) &&
+        shouldHardline &&
+        param &&
+        param.isNormalClassDeclaration
       ) {
         content = rejectAndConcat([hardline, content]);
       }

packages/prettier-plugin-java/test/unit-test/blank_lines/_output.java

@@ -1,4 +1,5 @@
 public class BlankLines {
+
   public int i = 1;
   public int j = 2;
 

packages/prettier-plugin-java/test/unit-test/char_literal/_output.java

@@ -1,4 +1,5 @@
 public class CharLiteral {
+
   final char singleQuote = '\'';
 
   final char backslash = '\\';

packages/prettier-plugin-java/test/unit-test/classes/_output.java

@@ -12,5 +12,6 @@ class LocalClassDeclaration {}
 }
 
 class ClassWithSemicolon {
+
   private FieldOneClass fieldOne;
 }

packages/prettier-plugin-java/test/unit-test/comments/class/_output.java

@@ -200,6 +200,7 @@ private ArrayTable(ArrayTable<R, C, V> table) {
 
   private abstract static class ArrayMap<K, V>
     extends IteratorBasedAbstractMap<K, V> {
+
     private final ImmutableMap<K, Integer> keyIndex;
 
     private ArrayMap(ImmutableMap<K, Integer> keyIndex) {
@@ -234,7 +235,6 @@ public boolean isEmpty() {
     Entry<K, V> getEntry(final int index) {
       checkElementIndex(index, size());
       return new AbstractMapEntry<K, V>() {
-
         @Override
         public K getKey() {
           return ArrayMap.this.getKey(index);
@@ -255,7 +255,6 @@ public V setValue(V value) {
     @Override
     Iterator<Entry<K, V>> entryIterator() {
       return new AbstractIndexedListIterator<Entry<K, V>>(size()) {
-
         @Override
         protected Entry<K, V> get(final int index) {
           return getEntry(index);
@@ -572,7 +571,6 @@ public Set<Cell<R, C, V>> cellSet() {
   @Override
   Iterator<Cell<R, C, V>> cellIterator() {
     return new AbstractIndexedListIterator<Cell<R, C, V>>(size()) {
-
       @Override
       protected Cell<R, C, V> get(final int index) {
         return getCell(index);
@@ -638,6 +636,7 @@ public Map<R, V> column(C columnKey) {
   }
 
   private class Column extends ArrayMap<R, V> {
+
     final int columnIndex;
 
     Column(int columnIndex) {
@@ -728,6 +727,7 @@ public Map<C, V> row(R rowKey) {
   }
 
   private class Row extends ArrayMap<C, V> {
+
     final int rowIndex;
 
     Row(int rowIndex) {
@@ -816,7 +816,6 @@ public Collection<V> values() {
   @Override
   Iterator<V> valuesIterator() {
     return new AbstractIndexedListIterator<V>(size()) {
-
       @Override
       protected V get(int index) {
         return getValue(index);

packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/complex/_output.java

@@ -1,4 +1,5 @@
 public class PrettierTest {
+
   var x = 0;
 
   public void myFunction(int arg1) {

packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/end-of-block/_output.java

@@ -32,6 +32,7 @@ class H {
 }
 
 class I { // alpha
+
   // beta
   int i;
   // one

packages/prettier-plugin-java/test/unit-test/complex_generic_class/_output.java

@@ -1,4 +1,5 @@
 public class GenericClass<BEAN extends Comparable<BEAN>> {
+
   private BEAN bean;
 
   public GenericClass(BEAN bean) {

packages/prettier-plugin-java/test/unit-test/empty_statement/_output.java

@@ -87,6 +87,7 @@ public void doWhileWithEmptyStatement(boolean one) {
 
 // Bug Fix: #356
 public class Test {
+
   public TestField testField;
 
   @Override

packages/prettier-plugin-java/test/unit-test/generic_class/_output.java

@@ -1,4 +1,5 @@
 public class GenericClass<BEAN> {
+
   private BEAN bean;
 
   public GenericClass(BEAN bean) {

packages/prettier-plugin-java/test/unit-test/marker_annotations/_output.java

@@ -8,6 +8,7 @@
 @NormalAnnotation("value")
 @MarkerAnnotation
 public class MarkerAnnotations {
+
   @SingleMemberAnnotation2(
     name = "Something much long that breaks",
     date = "01/01/2018"

packages/prettier-plugin-java/test/unit-test/modifiers/_output.java

@@ -25,6 +25,7 @@ public static interface InterfaceWithModifiers {
 @AnnotationOne
 @AnnotationTwo
 public abstract class AbstractClassWithModifiers {
+
   @Annotation
   private static volatile String field;
 
@@ -41,6 +42,7 @@ void onlyAnnotations() {}
 @AnnotationOne
 @AnnotationTwo
 public static final class ClassWithModifiers {
+
   @AnnotationOne
   @AnnotationTwo
   private static final transient String CONSTANT = "abc";

packages/prettier-plugin-java/test/unit-test/prettier-ignore/method/_output.java

@@ -1,4 +1,5 @@
 public class PrettierIgnoreClass {
+
   int myInteger;
 
   public void myPrettierIgnoreMethod(

packages/prettier-plugin-java/test/unit-test/prettier-ignore/multiple-ignore/_output.java

@@ -1,4 +1,5 @@
 public class PrettierIgnoreClass {
+
   int myInteger;
 
   public void myPrettierIgnoreMethod(

packages/prettier-plugin-java/test/unit-test/variables/_output.java

@@ -1,4 +1,5 @@
 public class Variables {
+
   public static int STATIC_VARIABLE = 123;
   private static final Logger LOGGER = LoggerFactory.getLogger(
     ComplexFilterTest.class
@@ -45,7 +46,6 @@ public class Variables {
   private int octLiteral = 001;
 
   private Interface anonymousClassVariable = new Interface() {
-
     @Override
     void doSomething() {
       System.out.println("do something");