prettier-plugin-java 2.6.6 → 2.6.8

package/dist/printers/classes.js

@@ -706,7 +706,4 @@ export class ClassesPrettierVisitor extends BaseCstPrettierPrinter {
     isDims() {
         return "isDims";
     }
-    isFollowingVariableDeclarator() {
-        return "isFollowingVariableDeclarator";
-    }
 }

package/dist/printers/expressions.js

@@ -3,6 +3,7 @@ import { builders, utils } from "prettier/doc";
 import { BaseCstPrettierPrinter } from "../base-cst-printer.js";
 import { isAnnotationCstNode } from "../types/utils.js";
 import { printArgumentListWithBraces } from "../utils/index.js";
+import { hasLeadingComments } from "./comments/comments-utils.js";
 import { printTokenWithComments } from "./comments/format-comments.js";
 import { handleCommentsBinaryExpression, handleCommentsParameters } from "./comments/handle-comments.js";
 import { concat, dedent, group, indent, indentIfBreak } from "./prettier-builder.js";
@@ -25,7 +26,7 @@ export class ExpressionsPrettierVisitor extends BaseCstPrettierPrinter {
             ctx.Arrow[0],
             ...(isLambdaBodyABlock
                 ? [" ", lambdaBody]
-                : [group(indent([line, lambdaBody]))])
+                : [group([indent([line, lambdaBody]), (params === null || params === void 0 ? void 0 : params.hug) ? softline : ""])])
         ];
         if (params === null || params === void 0 ? void 0 : params.hug) {
             return willBreak(lambdaParameters)
@@ -209,47 +210,23 @@ export class ExpressionsPrettierVisitor extends BaseCstPrettierPrinter {
         const newExpression = (_a = ctx.primaryPrefix[0].children.newExpression) === null || _a === void 0 ? void 0 : _a[0].children;
         const isBreakableNewExpression = countMethodInvocation <= 1 &&
             this.isBreakableNewExpression(newExpression);
-        const fqnOrRefType = (_b = ctx.primaryPrefix[0].children.fqnOrRefType) === null || _b === void 0 ? void 0 : _b[0].children;
-        const firstMethodInvocation = (_c = ctx.primarySuffix) === null || _c === void 0 ? void 0 : _c.map(suffix => { var _a; return (_a = suffix.children.methodInvocationSuffix) === null || _a === void 0 ? void 0 : _a[0].children; }).find(methodInvocationSuffix => methodInvocationSuffix);
+        const firstMethodInvocation = (_b = ctx.primarySuffix) === null || _b === void 0 ? void 0 : _b.map(suffix => { var _a; return (_a = suffix.children.methodInvocationSuffix) === null || _a === void 0 ? void 0 : _a[0].children; }).find(methodInvocationSuffix => methodInvocationSuffix);
+        const fqnOrRefType = (_c = ctx.primaryPrefix[0].children.fqnOrRefType) === null || _c === void 0 ? void 0 : _c[0].children;
+        const hasFqnRefPart = (fqnOrRefType === null || fqnOrRefType === void 0 ? void 0 : fqnOrRefType.fqnOrRefTypePartRest) !== undefined;
         const isCapitalizedIdentifier = this.isCapitalizedIdentifier(fqnOrRefType);
-        const shouldBreakBeforeFirstMethodInvocation = countMethodInvocation > 1 &&
-            !(isCapitalizedIdentifier !== null && isCapitalizedIdentifier !== void 0 ? isCapitalizedIdentifier : true) &&
-            firstMethodInvocation !== undefined;
+        const shouldBreakBeforeFirstMethodInvocation = countMethodInvocation > 1 && hasFqnRefPart && !isCapitalizedIdentifier;
         const shouldBreakBeforeMethodInvocations = shouldBreakBeforeFirstMethodInvocation ||
             countMethodInvocation > 2 ||
-            (countMethodInvocation > 1 && newExpression) ||
+            (countMethodInvocation > 1 && !!newExpression) ||
             !(firstMethodInvocation === null || firstMethodInvocation === void 0 ? void 0 : firstMethodInvocation.argumentList);
         const primaryPrefix = this.visit(ctx.primaryPrefix, Object.assign(Object.assign({}, params), { shouldBreakBeforeFirstMethodInvocation }));
-        const suffixes = [];
-        if (ctx.primarySuffix !== undefined) {
-            // edge case: https://github.com/jhipster/prettier-java/issues/381
-            let hasFirstInvocationArg = true;
-            if (ctx.primarySuffix.length > 1 &&
-                ctx.primarySuffix[1].children.methodInvocationSuffix &&
-                Object.keys(ctx.primarySuffix[1].children.methodInvocationSuffix[0].children).length === 2) {
-                hasFirstInvocationArg = false;
-            }
-            if (newExpression &&
-                !isBreakableNewExpression &&
-                ctx.primarySuffix[0].children.Dot !== undefined) {
-                suffixes.push(softline);
-            }
-            suffixes.push(this.visit(ctx.primarySuffix[0]));
-            for (let i = 1; i < ctx.primarySuffix.length; i++) {
-                if (shouldBreakBeforeMethodInvocations &&
-                    ctx.primarySuffix[i].children.Dot !== undefined &&
-                    ctx.primarySuffix[i - 1].children.methodInvocationSuffix !== undefined) {
-                    suffixes.push(softline);
-                }
-                suffixes.push(this.visit(ctx.primarySuffix[i]));
-            }
-            if (!newExpression && countMethodInvocation === 1) {
-                return group(rejectAndConcat([
-                    primaryPrefix,
-                    hasFirstInvocationArg ? suffixes[0] : indent(suffixes[0]),
-                    indent(rejectAndConcat(suffixes.slice(1)))
-                ]));
-            }
+        const suffixes = this.getPrimarySuffixes(ctx, newExpression, isBreakableNewExpression, shouldBreakBeforeMethodInvocations);
+        if (!newExpression && countMethodInvocation === 1) {
+            return group(rejectAndConcat([
+                primaryPrefix,
+                suffixes[0],
+                indent(rejectAndConcat(suffixes.slice(1)))
+            ]));
         }
         const methodInvocation = (_d = ctx.primarySuffix) === null || _d === void 0 ? void 0 : _d[0].children.methodInvocationSuffix;
         const isMethodInvocationWithArguments = (methodInvocation === null || methodInvocation === void 0 ? void 0 : methodInvocation[0].children.argumentList) !== undefined;
@@ -290,40 +267,25 @@ export class ExpressionsPrettierVisitor extends BaseCstPrettierPrinter {
         const fqnOrRefTypePartFirst = this.visit(ctx.fqnOrRefTypePartFirst);
         const fqnOrRefTypePartRest = this.mapVisit(ctx.fqnOrRefTypePartRest);
         const dims = this.visit(ctx.dims);
-        const dots = ctx.Dot ? ctx.Dot : [];
-        const isMethodInvocation = ctx.Dot && ctx.Dot.length === 1;
-        if (params !== undefined &&
-            params.shouldBreakBeforeFirstMethodInvocation === true) {
-            // when fqnOrRefType is a method call from an object
-            if (isMethodInvocation) {
-                return rejectAndConcat([
-                    indent(rejectAndJoin(concat([softline, dots[0]]), [
-                        fqnOrRefTypePartFirst,
-                        rejectAndJoinSeps(dots.slice(1), fqnOrRefTypePartRest),
-                        dims
-                    ]))
-                ]);
-                // otherwise it is a fully qualified name but we need to exclude when it is just a method call
-            }
-            else if (ctx.Dot) {
-                return indent(rejectAndConcat([
-                    rejectAndJoinSeps(dots.slice(0, dots.length - 1), [
-                        fqnOrRefTypePartFirst,
-                        ...fqnOrRefTypePartRest.slice(0, fqnOrRefTypePartRest.length - 1)
-                    ]),
-                    softline,
-                    rejectAndConcat([
-                        dots[dots.length - 1],
-                        fqnOrRefTypePartRest[fqnOrRefTypePartRest.length - 1]
-                    ]),
-                    dims
-                ]));
-            }
+        const dots = ctx.Dot
+            ? ctx.Dot.map(dot => {
+                if (hasLeadingComments(dot)) {
+                    return concat([softline, dot]);
+                }
+                return dot;
+            })
+            : [];
+        if ((params === null || params === void 0 ? void 0 : params.shouldBreakBeforeFirstMethodInvocation) === true &&
+            ctx.Dot !== undefined) {
+            dots[dots.length - 1] = concat([softline, ctx.Dot[ctx.Dot.length - 1]]);
         }
-        return rejectAndConcat([
-            rejectAndJoinSeps(dots, [fqnOrRefTypePartFirst, ...fqnOrRefTypePartRest]),
+        return indent(rejectAndConcat([
+            rejectAndJoinSeps(dots, [
+                fqnOrRefTypePartFirst,
+                ...fqnOrRefTypePartRest
+            ]),
             dims
-        ]);
+        ]));
     }
     fqnOrRefTypePartFirst(ctx) {
         const annotation = this.mapVisit(ctx.annotation);
@@ -430,7 +392,7 @@ export class ExpressionsPrettierVisitor extends BaseCstPrettierPrinter {
         return printArgumentListWithBraces.call(this, ctx.argumentList, ctx.RBrace[0], ctx.LBrace[0]);
     }
     argumentList(ctx) {
-        var _a, _b;
+        var _a;
         const headArgs = this.mapVisit(ctx.expression.slice(0, -1)).map((expression, index) => concat([expression, ctx.Comma[index], line]));
         const lastExpression = ctx.expression.at(-1);
         const lastArg = this.visit(lastExpression);
@@ -445,13 +407,7 @@ export class ExpressionsPrettierVisitor extends BaseCstPrettierPrinter {
                     shouldBreak: true
                 });
             }
-            const suffix = ((_b = lastExpression === null || lastExpression === void 0 ? void 0 : lastExpression.children.lambdaExpression) === null || _b === void 0 ? void 0 : _b[0].children.lambdaBody[0].children.block)
-                ? ""
-                : line;
-            const hugged = [
-                ...headArgs,
-                group([huggedLastArg, suffix], { shouldBreak: true })
-            ];
+            const hugged = [...headArgs, group(huggedLastArg, { shouldBreak: true })];
             const expanded = group([indent([line, ...headArgs, lastArg]), line], {
                 shouldBreak: true
             });
@@ -608,7 +564,28 @@ export class ExpressionsPrettierVisitor extends BaseCstPrettierPrinter {
             ...((_a = fqnOrRefType === null || fqnOrRefType === void 0 ? void 0 : fqnOrRefType.fqnOrRefTypePartRest) !== null && _a !== void 0 ? _a : [])
         ];
         const nextToLastIdentifier = (_c = (_b = fqnOrRefTypeParts[fqnOrRefTypeParts.length - 2]) === null || _b === void 0 ? void 0 : _b.children.fqnOrRefTypePartCommon[0].children.Identifier) === null || _c === void 0 ? void 0 : _c[0].image;
-        return (nextToLastIdentifier &&
+        return (!!nextToLastIdentifier &&
             /^\p{Uppercase_Letter}/u.test(nextToLastIdentifier));
     }
+    getPrimarySuffixes(ctx, newExpression, isBreakableNewExpression, shouldBreakBeforeMethodInvocations) {
+        if (ctx.primarySuffix === undefined) {
+            return [];
+        }
+        const suffixes = [];
+        if (newExpression &&
+            !isBreakableNewExpression &&
+            ctx.primarySuffix[0].children.Dot !== undefined) {
+            suffixes.push(softline);
+        }
+        suffixes.push(this.visit(ctx.primarySuffix[0]));
+        for (let i = 1; i < ctx.primarySuffix.length; i++) {
+            if (shouldBreakBeforeMethodInvocations &&
+                ctx.primarySuffix[i].children.Dot !== undefined &&
+                ctx.primarySuffix[i - 1].children.methodInvocationSuffix !== undefined) {
+                suffixes.push(softline);
+            }
+            suffixes.push(this.visit(ctx.primarySuffix[i]));
+        }
+        return suffixes;
+    }
 }

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "prettier-plugin-java",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "description": "Prettier Java Plugin",
   "type": "module",
   "exports": {
-    ".": {
-      "types": "./index.d.ts",
-      "import": "./dist/index.js"
-    }
+    "types": "./index.d.ts",
+    "default": "./dist/index.js"
   },
   "files": [
     "dist",
@@ -17,7 +15,7 @@
   "repository": "https://github.com/jhipster/prettier-java",
   "license": "Apache-2.0",
   "dependencies": {
-    "java-parser": "2.3.3",
+    "java-parser": "2.3.4",
     "lodash": "4.17.21"
   },
   "scripts": {
@@ -46,5 +44,5 @@
   "peerDependencies": {
     "prettier": "^3.0.0"
   },
-  "gitHead": "b80f28061b45d46df03c441ff3af3d68e84b3c23"
+  "gitHead": "a1b05b474a157165133bff7a86c1d2b88bbfa5b4"
 }

package/dist/utils/expressions-utils.js

@@ -1,25 +0,0 @@
-export function isArgumentListSingleLambda(argumentList) {
-    if (argumentList === undefined) {
-        return false;
-    }
-    const args = argumentList[0].children.expression;
-    if (args.length !== 1) {
-        return false;
-    }
-    const argument = args[0];
-    return argument.children.lambdaExpression !== undefined;
-}
-export const isSingleArgumentLambdaExpressionWithBlock = (argumentList) => {
-    if (argumentList === undefined) {
-        return false;
-    }
-    const args = argumentList[0].children.expression;
-    if (args.length !== 1) {
-        return false;
-    }
-    const argument = args[0];
-    return (argument.children.lambdaExpression !== undefined &&
-        argument.children.lambdaExpression[0].children.lambdaBody[0].children
-            .block !== undefined);
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhwcmVzc2lvbnMtdXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvZXhwcmVzc2lvbnMtdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsTUFBTSxVQUFVLDBCQUEwQixDQUN4QyxZQUErQztJQUUvQyxJQUFJLFlBQVksS0FBSyxTQUFTLEVBQUU7UUFDOUIsT0FBTyxLQUFLLENBQUM7S0FDZDtJQUVELE1BQU0sSUFBSSxHQUFHLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2pELElBQUksSUFBSSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7UUFDckIsT0FBTyxLQUFLLENBQUM7S0FDZDtJQUVELE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN6QixPQUFPLFFBQVEsQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLEtBQUssU0FBUyxDQUFDO0FBQzFELENBQUM7QUFFRCxNQUFNLENBQUMsTUFBTSx5Q0FBeUMsR0FBRyxDQUN2RCxZQUErQyxFQUMvQyxFQUFFO0lBQ0YsSUFBSSxZQUFZLEtBQUssU0FBUyxFQUFFO1FBQzlCLE9BQU8sS0FBSyxDQUFDO0tBQ2Q7SUFFRCxNQUFNLElBQUksR0FBRyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNqRCxJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1FBQ3JCLE9BQU8sS0FBSyxDQUFDO0tBQ2Q7SUFFRCxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDekIsT0FBTyxDQUNMLFFBQVEsQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLEtBQUssU0FBUztRQUNoRCxRQUFRLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUTthQUNsRSxLQUFLLEtBQUssU0FBUyxDQUN2QixDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=

package/dist/utils/printSingleLambdaInvocation.js

@@ -1,18 +0,0 @@
-import { builders } from "prettier/doc";
-import { isSingleArgumentLambdaExpressionWithBlock } from "./expressions-utils.js";
-import { printTokenWithComments } from "../printers/comments/format-comments.js";
-import { concat, dedent, indent } from "../printers/prettier-builder.js";
-import { putIntoBraces } from "../printers/printer-utils.js";
-const { softline, ifBreak } = builders;
-export default function printSingleLambdaInvocation(argumentListCtx, rBrace, lBrace) {
-    const lambdaParametersGroupId = Symbol("lambdaParameters");
-    const argumentList = this.visit(argumentListCtx, {
-        lambdaParametersGroupId,
-        isInsideMethodInvocationSuffix: true
-    });
-    const formattedRBrace = isSingleArgumentLambdaExpressionWithBlock(argumentListCtx)
-        ? ifBreak(indent(concat([softline, rBrace])), printTokenWithComments(rBrace), { groupId: lambdaParametersGroupId })
-        : indent(concat([softline, rBrace]));
-    return dedent(putIntoBraces(argumentList, "", lBrace, formattedRBrace));
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpbnRTaW5nbGVMYW1iZGFJbnZvY2F0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3ByaW50U2luZ2xlTGFtYmRhSW52b2NhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sRUFBRSx5Q0FBeUMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ25GLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3pFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUU3RCxNQUFNLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxHQUFHLFFBQVEsQ0FBQztBQUV2QyxNQUFNLENBQUMsT0FBTyxVQUFVLDJCQUEyQixDQUNqRCxlQUFrRCxFQUNsRCxNQUFjLEVBQ2QsTUFBYztJQUVkLE1BQU0sdUJBQXVCLEdBQUcsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUM7SUFDM0QsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxlQUFlLEVBQUU7UUFDL0MsdUJBQXVCO1FBQ3ZCLDhCQUE4QixFQUFFLElBQUk7S0FDckMsQ0FBQyxDQUFDO0lBRUgsTUFBTSxlQUFlLEdBQUcseUNBQXlDLENBQy9ELGVBQWUsQ0FDaEI7UUFDQyxDQUFDLENBQUMsT0FBTyxDQUNMLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUNsQyxzQkFBc0IsQ0FBQyxNQUFNLENBQUMsRUFDOUIsRUFBRSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsQ0FDckM7UUFDSCxDQUFDLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdkMsT0FBTyxNQUFNLENBQUMsYUFBYSxDQUFDLFlBQVksRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLGVBQWUsQ0FBQyxDQUFDLENBQUM7QUFDMUUsQ0FBQyJ9