feat(printer): add guarded pattern matching support

jhipster · Nov 26, 2022 · a36b2cc · a36b2cc
1 parent bfdc38e
commit a36b2cc
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 1 deletion.
diff --git a/packages/prettier-plugin-java/src/printers/expressions.ts b/packages/prettier-plugin-java/src/printers/expressions.ts
@@ -34,6 +34,7 @@ import {
   ParenthesisExpressionCtx,
   PatternCtx,
   PrimaryCtx,
+  PrimaryPatternCtx,
   PrimaryPrefixCtx,
   PrimarySuffixCtx,
   PrimitiveCastExpressionCtx,
@@ -75,6 +76,7 @@ import {
   sortAnnotationIdentifier,
   sortNodes
 } from "./printer-utils";
+import join = builders.join;
 
 const { ifBreak, line, softline, indentIfBreak } = builders;
 
@@ -759,7 +761,28 @@ export class ExpressionsPrettierVisitor extends BaseCstPrettierPrinter {
   }
 
   pattern(ctx: PatternCtx) {
-    return this.visitSingle(ctx);
+    const primaryPattern = this.visit(ctx.primaryPattern);
+    if (ctx.AndAnd === undefined) {
+      return primaryPattern;
+    }
+
+    const binaryExpression = this.visit(ctx.binaryExpression);
+    return rejectAndConcat([
+      primaryPattern,
+      " ",
+      ctx.AndAnd[0],
+      line,
+      binaryExpression
+    ]);
+  }
+
+  primaryPattern(ctx: PrimaryPatternCtx) {
+    if (ctx.LBrace === undefined) {
+      return this.visitSingle(ctx);
+    }
+
+    const pattern = this.visit(ctx.pattern);
+    return putIntoBraces(pattern, softline, ctx.LBrace[0], ctx.RBrace![0]);
   }
 
   typePattern(ctx: TypePatternCtx) {

diff --git a/packages/prettier-plugin-java/test/unit-test/pattern-matching/_input.java b/packages/prettier-plugin-java/test/unit-test/pattern-matching/_input.java
@@ -12,4 +12,24 @@ static String formatter(Object o) {
         }
         return formatted;
     }
+
+    void test(Buyer other) {
+        return switch (other) {
+            case null -> true;
+            case Buyer b && this.bestPrice > b.bestPrice -> true;
+            case Buyer b && this.bestPrice > b.bestPrice -> {
+                return true;
+            }
+            case (Buyer b && this.bestPrice > b.bestPrice) -> true;
+            case Buyer b && this.bestPrice > b.bestPrice && this.bestPrice > b.bestPrice && this.bestPrice > b.bestPrice && this.bestPrice > b.bestPrice -> true;
+            case Buyer b && this.bestPrice > b.bestPrice && this.bestPrice > b.bestPrice && this.bestPrice > b.bestPrice && this.bestPrice > b.bestPrice -> {
+                return true;
+            }
+            case (Buyer b && this.bestPrice > b.bestPrice && this.bestPrice > b.bestPrice && this.bestPrice > b.bestPrice && this.bestPrice > b.bestPrice) -> true;
+            case (Buyer b && this.bestPrice > b.bestPrice && this.bestPrice > b.bestPrice && this.bestPrice > b.bestPrice && this.bestPrice > b.bestPrice) -> {
+                return true;
+            }
+            default -> false;
+        };
+    }
 }
diff --git a/packages/prettier-plugin-java/test/unit-test/pattern-matching/_output.java b/packages/prettier-plugin-java/test/unit-test/pattern-matching/_output.java
@@ -18,4 +18,44 @@ static String formatter(Object o) {
     }
     return formatted;
   }
+
+  void test(Buyer other) {
+    return switch (other) {
+      case null -> true;
+      case Buyer b && this.bestPrice > b.bestPrice -> true;
+      case Buyer b && this.bestPrice > b.bestPrice -> {
+        return true;
+      }
+      case (Buyer b && this.bestPrice > b.bestPrice) -> true;
+      case Buyer b &&
+        this.bestPrice > b.bestPrice &&
+        this.bestPrice > b.bestPrice &&
+        this.bestPrice > b.bestPrice &&
+        this.bestPrice > b.bestPrice -> true;
+      case Buyer b &&
+        this.bestPrice > b.bestPrice &&
+        this.bestPrice > b.bestPrice &&
+        this.bestPrice > b.bestPrice &&
+        this.bestPrice > b.bestPrice -> {
+        return true;
+      }
+      case (
+          Buyer b &&
+          this.bestPrice > b.bestPrice &&
+          this.bestPrice > b.bestPrice &&
+          this.bestPrice > b.bestPrice &&
+          this.bestPrice > b.bestPrice
+        ) -> true;
+      case (
+          Buyer b &&
+          this.bestPrice > b.bestPrice &&
+          this.bestPrice > b.bestPrice &&
+          this.bestPrice > b.bestPrice &&
+          this.bestPrice > b.bestPrice
+        ) -> {
+        return true;
+      }
+      default -> false;
+    };
+  }
 }