fix: fix formating for variable arity parameters with variable modifier

jhipster · Dec 5, 2019 · 0d611e0 · 0d611e0
1 parent 9169fd6
commit 0d611e0
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/packages/prettier-plugin-java/src/printers/classes.js b/packages/prettier-plugin-java/src/printers/classes.js
@@ -461,14 +461,22 @@ class ClassesPrettierVisitor {
   variableArityParameter(ctx) {
     const variableModifier = this.mapVisit(ctx.variableModifier);
     const unannType = this.visit(ctx.unannType);
-    const annotation = this.mapVisit(ctx.annotation);
+    const annotations = this.mapVisit(ctx.annotation);
     const identifier = ctx.Identifier[0];
 
-    return rejectAndConcat([
+    const unannTypePrinted =
+      ctx.annotation === undefined
+        ? concat([unannType, ctx.DotDotDot[0]])
+        : unannType;
+    const annotationsPrinted =
+      ctx.annotation === undefined
+        ? annotations
+        : concat([rejectAndJoin(" ", annotations), ctx.DotDotDot[0]]);
+
+    return rejectAndJoin(" ", [
       join(" ", variableModifier),
-      unannType,
-      join(" ", annotation),
-      concat([ctx.DotDotDot[0], " "]),
+      unannTypePrinted,
+      annotationsPrinted,
       identifier
     ]);
   }

diff --git a/packages/prettier-plugin-java/test/unit-test/args/_input.java b/packages/prettier-plugin-java/test/unit-test/args/_input.java
@@ -13,4 +13,12 @@ public void longListOfParametersThatShouldBreak(String one, Integer two, String
 
   void lastParameterDotDotDot(String str1, String... str2) {
   }
+
+  // TODO: uncomment when the parser variable arity bug is fixed (see #139)
+  // void variableArityParameters(Object @Nullable... errorMessageArgs) {}
+
+  void variableArityParameters(final String... strings) {
+
+  }
+
 }
diff --git a/packages/prettier-plugin-java/test/unit-test/args/_output.java b/packages/prettier-plugin-java/test/unit-test/args/_output.java
@@ -18,4 +18,8 @@ public void longListOfParametersThatShouldBreak(
   ) {}
 
   void lastParameterDotDotDot(String str1, String... str2) {}
+
+  // TODO: uncomment when the parser variable arity bug is fixed (see #139)
+  // void variableArityParameters(Object @Nullable... errorMessageArgs) {}
+  void variableArityParameters(final String... strings) {}
 }