prettier-plugin-java 1.5.0 → 1.6.2

package/LICENSE

@@ -1,5 +1,5 @@
 
-    Copyright 2018-2021 the original author or authors from the JHipster project
+    Copyright 2018-2022 the original author or authors from the JHipster project
 
                                  Apache License
                            Version 2.0, January 2004

package/dist/printers/classes.js

@@ -647,30 +647,34 @@ 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, line]); }) : [];
+        var blankLineSeparators = printer_utils_1.getBlankLinesSeparator(ctx.recordComponent, line);
+        var commas = ctx.Comma
+            ? ctx.Comma.map(function (elt, index) {
+                return prettier_builder_1.concat([elt, blankLineSeparators[index]]);
+            })
+            : [];
         return printer_utils_1.rejectAndJoinSeps(commas, recordComponents);
     };
     ClassesPrettierVisitor.prototype.recordComponent = function (ctx) {
         var modifiers = this.mapVisit(ctx.recordComponentModifier);
         var unannType = this.visit(ctx.unannType);
         if (ctx.Identifier !== undefined) {
-            return printer_utils_1.rejectAndJoin(" ", [
-                prettier_builder_1.join(" ", modifiers),
-                unannType,
-                ctx.Identifier[0]
-            ]);
+            return prettier_builder_1.group(printer_utils_1.rejectAndJoin(line, [
+                prettier_builder_1.join(line, modifiers),
+                prettier_builder_1.join(" ", [unannType, ctx.Identifier[0]])
+            ]));
         }
         var variableArityRecordComponent = this.visit(ctx.variableArityRecordComponent);
         if (ctx.variableArityRecordComponent[0].children.annotation !== undefined) {
-            return printer_utils_1.rejectAndJoin(" ", [
-                prettier_builder_1.join(" ", modifiers),
+            return prettier_builder_1.group(printer_utils_1.rejectAndJoin(line, [
+                prettier_builder_1.join(line, modifiers),
                 prettier_builder_1.join(" ", [unannType, variableArityRecordComponent])
-            ]);
+            ]));
         }
-        return printer_utils_1.rejectAndJoin(" ", [
-            prettier_builder_1.join(" ", modifiers),
+        return prettier_builder_1.group(printer_utils_1.rejectAndJoin(line, [
+            prettier_builder_1.join(line, modifiers),
             prettier_builder_1.concat([unannType, variableArityRecordComponent])
-        ]);
+        ]));
     };
     ClassesPrettierVisitor.prototype.variableArityRecordComponent = function (ctx) {
         var annotations = this.mapVisit(ctx.annotation);

package/dist/printers/expressions.js

@@ -399,13 +399,13 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
     };
     ExpressionsPrettierVisitor.prototype.referenceTypeCastExpression = function (ctx) {
         var referenceType = this.visit(ctx.referenceType);
-        var additionalBound = this.mapVisit(ctx.additionalBound);
+        var hasAdditionalBounds = ctx.additionalBound !== undefined;
+        var additionalBounds = printer_utils_1.rejectAndJoin(line, this.mapVisit(ctx.additionalBound));
         var expression = ctx.lambdaExpression
             ? this.visit(ctx.lambdaExpression)
             : this.visit(ctx.unaryExpressionNotPlusMinus);
         return printer_utils_1.rejectAndJoin(" ", [
-            printer_utils_1.rejectAndConcat([ctx.LBrace[0], referenceType, ctx.RBrace[0]]),
-            additionalBound,
+            printer_utils_1.putIntoBraces(printer_utils_1.rejectAndJoin(line, [referenceType, additionalBounds]), hasAdditionalBounds ? softline : "", ctx.LBrace[0], ctx.RBrace[0]),
             expression
         ]);
     };

package/dist/printers/printer-utils.js

@@ -259,7 +259,8 @@ function isExplicitLambdaParameter(ctx) {
         ctx.lambdaParameterList[0].children.explicitLambdaParameterList);
 }
 exports.isExplicitLambdaParameter = isExplicitLambdaParameter;
-function getBlankLinesSeparator(ctx) {
+function getBlankLinesSeparator(ctx, separator) {
+    if (separator === void 0) { separator = hardline; }
     if (ctx === undefined) {
         return undefined;
     }
@@ -277,7 +278,7 @@ function getBlankLinesSeparator(ctx) {
             separators.push(prettier_builder_1.concat([hardline, hardline]));
         }
         else {
-            separators.push(hardline);
+            separators.push(separator);
         }
     }
     return separators;

package/dist/utils/constants.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.whitespace = void 0;
+exports.whitespace = " ";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-java",
-  "version": "1.5.0",
+  "version": "1.6.2",
   "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.0",
+    "java-parser": "2.0.2",
     "lodash": "4.17.21",
     "prettier": "2.3.1"
   },
@@ -42,5 +42,5 @@
     "ts-node": "10.2.1",
     "typescript": "4.3.5"
   },
-  "gitHead": "a9fe7da3d13d0c8a4b74dc6623f3b388fc2aade4"
+  "gitHead": "2e731c6dcec31dc9e58ec1721eef821f7fc031ee"
 }