prettier-plugin-java 2.3.1 → 2.4.0

package/dist/options.js

@@ -171,8 +171,10 @@ module.exports = {
             { value: "arrayAccessSuffix" },
             { value: "methodReferenceSuffix" },
             { value: "pattern" },
-            { value: "primaryPattern" },
             { value: "typePattern" },
+            { value: "recordPattern" },
+            { value: "patternList" },
+            { value: "guard" },
             { value: "identifyNewExpressionType" },
             { value: "isLambdaExpression" },
             { value: "isCastExpression" },

package/dist/printers/blocks-and-statements.js

@@ -221,7 +221,12 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
         if (ctx.Default || ctx.Null) {
             return this.getSingle(ctx);
         }
-        return this.visitSingle(ctx);
+        else if (ctx.pattern) {
+            var pattern = this.visit(ctx.pattern);
+            var guard = this.visit(ctx.guard);
+            return (0, printer_utils_1.rejectAndJoin)(" ", [(0, prettier_builder_1.dedent)(pattern), guard]);
+        }
+        return this.visit(ctx.caseConstant);
     };
     BlocksAndStatementPrettierVisitor.prototype.switchRule = function (ctx) {
         var switchLabel = this.visit(ctx.switchLabel);
@@ -235,7 +240,7 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
         else {
             caseInstruction = (0, prettier_builder_1.concat)([this.visit(ctx.expression), ctx.Semicolon[0]]);
         }
-        return (0, prettier_builder_1.join)(" ", [switchLabel, ctx.Arrow[0], caseInstruction]);
+        return (0, prettier_builder_1.concat)([switchLabel, " ", ctx.Arrow[0], " ", caseInstruction]);
     };
     BlocksAndStatementPrettierVisitor.prototype.caseConstant = function (ctx) {
         return this.visitSingle(ctx);

package/dist/printers/expressions.js

@@ -503,29 +503,31 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
         return (0, printer_utils_1.rejectAndConcat)([ctx.ColonColon[0], typeArguments, identifierOrNew]);
     };
     ExpressionsPrettierVisitor.prototype.pattern = function (ctx) {
-        var primaryPattern = this.visit(ctx.primaryPattern);
-        if (ctx.AndAnd === undefined) {
-            return primaryPattern;
-        }
-        var binaryExpression = this.visit(ctx.binaryExpression);
-        return (0, printer_utils_1.rejectAndConcat)([
-            primaryPattern,
-            " ",
-            ctx.AndAnd[0],
-            line,
-            binaryExpression
-        ]);
-    };
-    ExpressionsPrettierVisitor.prototype.primaryPattern = function (ctx) {
-        if (ctx.LBrace === undefined) {
-            return this.visitSingle(ctx);
-        }
-        var pattern = this.visit(ctx.pattern);
-        return (0, printer_utils_1.putIntoBraces)(pattern, softline, ctx.LBrace[0], ctx.RBrace[0]);
+        return this.visitSingle(ctx);
     };
     ExpressionsPrettierVisitor.prototype.typePattern = function (ctx) {
         return this.visitSingle(ctx);
     };
+    ExpressionsPrettierVisitor.prototype.recordPattern = function (ctx) {
+        var referenceType = this.visit(ctx.referenceType);
+        var patternList = this.visit(ctx.patternList);
+        return (0, prettier_builder_1.concat)([
+            referenceType,
+            (0, printer_utils_1.putIntoBraces)(patternList, softline, ctx.LBrace[0], ctx.RBrace[0])
+        ]);
+    };
+    ExpressionsPrettierVisitor.prototype.patternList = function (ctx) {
+        var _a, _b;
+        var patterns = this.mapVisit(ctx.pattern);
+        var commas = (_b = (_a = ctx.Comma) === null || _a === void 0 ? void 0 : _a.map(function (elt) { return (0, prettier_builder_1.concat)([elt, line]); })) !== null && _b !== void 0 ? _b : [];
+        return (0, printer_utils_1.rejectAndJoinSeps)(commas, patterns);
+    };
+    ExpressionsPrettierVisitor.prototype.guard = function (ctx) {
+        var expression = this.visit(ctx.expression, {
+            addParenthesisToWrapStatement: true
+        });
+        return (0, prettier_builder_1.concat)([ctx.When[0], " ", (0, prettier_builder_1.dedent)(expression)]);
+    };
     ExpressionsPrettierVisitor.prototype.identifyNewExpressionType = function () {
         return "identifyNewExpressionType";
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-java",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "description": "Prettier Java Plugin",
   "main": "dist/index.js",
   "files": [
@@ -9,7 +9,7 @@
   "repository": "https://github.com/jhipster/prettier-java",
   "license": "Apache-2.0",
   "dependencies": {
-    "java-parser": "2.0.5",
+    "java-parser": "2.1.0",
     "lodash": "4.17.21",
     "prettier": "3.0.3"
   },
@@ -41,5 +41,5 @@
     "ts-node": "10.9.1",
     "typescript": "4.9.3"
   },
-  "gitHead": "a7f9a5f795a87ccfd7910118b0856b449dedb957"
+  "gitHead": "acdd5e7f28d08c4fb0351cfaf43d4ff9524b90ba"
 }