prettier-plugin-java 1.4.0 → 1.5.0

package/dist/options.js

@@ -26,6 +26,8 @@ module.exports = {
             { value: "switchBlock" },
             { value: "switchBlockStatementGroup" },
             { value: "switchLabel" },
+            { value: "caseOrDefaultLabel" },
+            { value: "caseLabelElement" },
             { value: "switchRule" },
             { value: "caseConstant" },
             { value: "whileStatement" },

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

@@ -181,20 +181,26 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
         return printer_utils_1.putIntoBraces(printer_utils_1.rejectAndJoin(hardline, switchCases), hardline, ctx.LCurly[0], ctx.RCurly[0]);
     };
     BlocksAndStatementPrettierVisitor.prototype.switchBlockStatementGroup = function (ctx) {
-        var switchLabels = this.mapVisit(ctx.switchLabel);
-        var labels = [];
-        for (var i = 0; i < switchLabels.length; i++) {
-            labels.push(prettier_builder_1.concat([switchLabels[i], ctx.Colon[i]]));
-        }
+        var switchLabel = this.visit(ctx.switchLabel);
         var blockStatements = this.visit(ctx.blockStatements);
-        return prettier_builder_1.indent(printer_utils_1.rejectAndJoin(hardline, [
-            prettier_builder_1.dedent(printer_utils_1.rejectAndJoin(hardline, labels)),
-            blockStatements
-        ]));
+        return prettier_builder_1.concat([
+            switchLabel,
+            ctx.Colon[0],
+            blockStatements && prettier_builder_1.indent([hardline, blockStatements])
+        ]);
     };
     BlocksAndStatementPrettierVisitor.prototype.switchLabel = function (ctx) {
+        var caseOrDefaultLabels = this.mapVisit(ctx.caseOrDefaultLabel);
+        var colons = ctx.Colon
+            ? ctx.Colon.map(function (elt) {
+                return prettier_builder_1.concat([elt, hardline]);
+            })
+            : [];
+        return prettier_builder_1.group(printer_utils_1.rejectAndJoinSeps(colons, caseOrDefaultLabels));
+    };
+    BlocksAndStatementPrettierVisitor.prototype.caseOrDefaultLabel = function (ctx) {
         if (ctx.Case) {
-            var caseConstants = this.mapVisit(ctx.caseConstant);
+            var caseLabelElements = this.mapVisit(ctx.caseLabelElement);
             var commas = ctx.Comma
                 ? ctx.Comma.map(function (elt) {
                     return prettier_builder_1.concat([elt, line]);
@@ -202,11 +208,17 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
                 : [];
             return prettier_builder_1.group(prettier_builder_1.indent(printer_utils_1.rejectAndConcat([
                 prettier_builder_1.concat([ctx.Case[0], " "]),
-                printer_utils_1.rejectAndJoinSeps(commas, caseConstants)
+                printer_utils_1.rejectAndJoinSeps(commas, caseLabelElements)
             ])));
         }
         return prettier_builder_1.concat([ctx.Default[0]]);
     };
+    BlocksAndStatementPrettierVisitor.prototype.caseLabelElement = function (ctx) {
+        if (ctx.Default || ctx.Null) {
+            return this.getSingle(ctx);
+        }
+        return this.visitSingle(ctx);
+    };
     BlocksAndStatementPrettierVisitor.prototype.switchRule = function (ctx) {
         var switchLabel = this.visit(ctx.switchLabel);
         var caseInstruction;

package/dist/printers/classes.js

@@ -104,12 +104,12 @@ var ClassesPrettierVisitor = /** @class */ (function (_super) {
     };
     ClassesPrettierVisitor.prototype.typeParameters = function (ctx) {
         var typeParameterList = this.visit(ctx.typeParameterList);
-        return printer_utils_1.rejectAndConcat([ctx.Less[0], typeParameterList, ctx.Greater[0]]);
+        return printer_utils_1.putIntoBraces(typeParameterList, softline, ctx.Less[0], ctx.Greater[0]);
     };
     ClassesPrettierVisitor.prototype.typeParameterList = function (ctx) {
         var typeParameter = this.mapVisit(ctx.typeParameter);
-        var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return prettier_builder_1.concat([elt, " "]); }) : [];
-        return printer_utils_1.rejectAndJoinSeps(commas, typeParameter);
+        var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return prettier_builder_1.concat([elt, line]); }) : [];
+        return prettier_builder_1.group(printer_utils_1.rejectAndJoinSeps(commas, typeParameter));
     };
     ClassesPrettierVisitor.prototype.superclass = function (ctx) {
         return prettier_builder_1.join(" ", [ctx.Extends[0], this.visit(ctx.classType)]);
@@ -647,7 +647,7 @@ var ClassesPrettierVisitor = /** @class */ (function (_super) {
     };
     ClassesPrettierVisitor.prototype.recordComponentList = function (ctx) {
         var recordComponents = this.mapVisit(ctx.recordComponent);
-        var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return prettier_builder_1.concat([elt, " "]); }) : [];
+        var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return prettier_builder_1.concat([elt, line]); }) : [];
         return printer_utils_1.rejectAndJoinSeps(commas, recordComponents);
     };
     ClassesPrettierVisitor.prototype.recordComponent = function (ctx) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-java",
-  "version": "1.4.0",
+  "version": "1.5.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": "1.4.0",
+    "java-parser": "2.0.0",
     "lodash": "4.17.21",
     "prettier": "2.3.1"
   },
@@ -42,5 +42,5 @@
     "ts-node": "10.2.1",
     "typescript": "4.3.5"
   },
-  "gitHead": "ccc76f65f711ad5be7a7980077e1bfcb54d0571d"
+  "gitHead": "a9fe7da3d13d0c8a4b74dc6623f3b388fc2aade4"
 }