feat: split record parameters on several lines

jhipster · Oct 2, 2021 · c2653b9 · c2653b9
1 parent ccc76f6
commit c2653b9
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 8 deletions.
diff --git a/packages/prettier-plugin-java/src/printers/classes.ts b/packages/prettier-plugin-java/src/printers/classes.ts
@@ -924,7 +924,7 @@ export class ClassesPrettierVisitor extends BaseCstPrettierPrinter {
   }
   recordComponentList(ctx: RecordComponentListCtx) {
     const recordComponents = this.mapVisit(ctx.recordComponent);
-    const commas = ctx.Comma ? ctx.Comma.map(elt => concat([elt, " "])) : [];
+    const commas = ctx.Comma ? ctx.Comma.map(elt => concat([elt, line])) : [];
 
     return rejectAndJoinSeps(commas, recordComponents);
   }

diff --git a/packages/prettier-plugin-java/test/unit-test/records/_input.java b/packages/prettier-plugin-java/test/unit-test/records/_input.java
@@ -1,3 +1,11 @@
+public record Pet(
+@NotNull String name
+    ) {}
+
+    public record Pet(
+@NotNull String name, int age
+    ) {}
+
 public record Pet(
 @NotNull String name, int age, String... others, Object @Nullable... errorMessageArgs
     ) {
@@ -46,7 +54,7 @@ record MyRecord(String name, int age
             if (age < 0) {
               throw new IllegalArgumentException("Age cannot be negative");
             }
-    
+
       if (name == null || name.isBlank()) {
               throw new IllegalArgumentException("Name cannot be blank");
        }
@@ -71,18 +79,18 @@ public MyRecord(String name,
 
 public class MyRecordWithAnnotationAndModifiers {
                 public record MyRecord(
-          String name, 
+          String name,
           int age) {
                 @Annotation
           @Annotation2
           public MyRecord {
             if (
-                age < 0) 
+                age < 0)
             {
               throw new IllegalArgumentException("Age cannot be negative");
             }
-    
-            if (name == null || 
+
+            if (name == null ||
             name.isBlank()) {
               throw new IllegalArgumentException("Name cannot be blank");
             }
@@ -91,9 +99,30 @@ public record MyRecord(
     }
 }
 
+class MySplitRecordConstructor {
+    record MyRecord(String name,
+     int age, String name,
+     int age,String name,
+     int age) {
+          public MyRecord(String name,
+           int age) {
+            if (age < 0) {
+  throw new IllegalArgumentException("Age cannot be negative");
+            }
+                if (name == null || name.isBlank()) {
+              throw new IllegalArgumentException("Name cannot be blank");
+        }
+          }
+      }
+}
+
 public interface MyInterface {
     record MyRecord(
         String param) implements MyInterface {
 
          }
+}
+
+public interface MyInterface {
+  record MySplitRecord(String param, String param, String param, String param, String param, String param) implements MyInterface {}
 }
diff --git a/packages/prettier-plugin-java/test/unit-test/records/_output.java b/packages/prettier-plugin-java/test/unit-test/records/_output.java
@@ -1,5 +1,12 @@
+public record Pet(@NotNull String name) {}
+
+public record Pet(@NotNull String name, int age) {}
+
 public record Pet(
-  @NotNull String name, int age, String... others, Object @Nullable... errorMessageArgs
+  @NotNull String name,
+  int age,
+  String... others,
+  Object @Nullable... errorMessageArgs
 ) {
   public Pet {
     if (age < 0) {
@@ -15,7 +22,10 @@ public void test() {}
 }
 
 public record Pet(
-  @NotNull String name, int age, String... others, Object @Nullable... errorMessageArgs
+  @NotNull String name,
+  int age,
+  String... others,
+  Object @Nullable... errorMessageArgs
 ) {}
 
 public record Pet() {}
@@ -79,6 +89,39 @@ public record MyRecord(String name, int age) {
   }
 }
 
+class MySplitRecordConstructor {
+
+  record MyRecord(
+    String name,
+    int age,
+    String name,
+    int age,
+    String name,
+    int age
+  ) {
+    public MyRecord(String name, int age) {
+      if (age < 0) {
+        throw new IllegalArgumentException("Age cannot be negative");
+      }
+      if (name == null || name.isBlank()) {
+        throw new IllegalArgumentException("Name cannot be blank");
+      }
+    }
+  }
+}
+
 public interface MyInterface {
   record MyRecord(String param) implements MyInterface {}
 }
+
+public interface MyInterface {
+  record MySplitRecord(
+    String param,
+    String param,
+    String param,
+    String param,
+    String param,
+    String param
+  )
+    implements MyInterface {}
+}