prettier-plugin-java 2.6.4 → 2.6.6

package/LICENSE

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

package/dist/index.js

@@ -6,8 +6,8 @@ const languages = [
         name: "Java",
         parsers: ["java"],
         group: "Java",
-        tmScope: "text.html.vue",
-        aceMode: "html",
+        tmScope: "text.html.vue", // FIXME
+        aceMode: "html", // FIXME
         codemirrorMode: "clike",
         codemirrorMimeType: "text/x-java",
         extensions: [".java"],

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

@@ -76,7 +76,7 @@ export class BlocksAndStatementPrettierVisitor extends BaseCstPrettierPrinter {
     labeledStatement(ctx) {
         const identifier = ctx.Identifier[0];
         const statement = this.visit(ctx.statement);
-        return rejectAndJoin(ctx.Colon[0], [identifier, statement]);
+        return concat([identifier, ctx.Colon[0], " ", statement]);
     }
     expressionStatement(ctx) {
         const statementExpression = this.visit(ctx.statementExpression);

package/dist/printers/classes.js

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

package/dist/printers/comments/handle-comments.js

@@ -65,12 +65,12 @@ function moveOperatorLeadingCommentsToNextExpression(ctx) {
 }
 function moveExpressionTrailingCommentsToNextOperator(ctx) {
     const binaryOperators = ctx.BinaryOperator;
-    let binaryOperatorIndex = 1;
+    let binaryOperatorIndex = 0;
     if (binaryOperators === null || binaryOperators === void 0 ? void 0 : binaryOperators.length) {
         ctx.unaryExpression.forEach(unaryExpression => {
             var _a;
             if (hasTrailingComments(unaryExpression)) {
-                while (binaryOperatorIndex < binaryOperators.length &&
+                while (binaryOperatorIndex < binaryOperators.length - 1 &&
                     unaryExpression.location.endOffset &&
                     binaryOperators[binaryOperatorIndex].startOffset <
                         unaryExpression.location.endOffset) {

package/dist/printers/expressions.js

@@ -5,8 +5,8 @@ import { isAnnotationCstNode } from "../types/utils.js";
 import { printArgumentListWithBraces } from "../utils/index.js";
 import { printTokenWithComments } from "./comments/format-comments.js";
 import { handleCommentsBinaryExpression, handleCommentsParameters } from "./comments/handle-comments.js";
-import { concat, dedent, group, indent } from "./prettier-builder.js";
-import { binary, findDeepElementInPartsArray, isExplicitLambdaParameter, isUniqueMethodInvocation, putIntoBraces, rejectAndConcat, rejectAndJoin, rejectAndJoinSeps, sortAnnotationIdentifier, sortNodes, sortTokens } from "./printer-utils.js";
+import { concat, dedent, group, indent, indentIfBreak } from "./prettier-builder.js";
+import { binary, findDeepElementInPartsArray, getOperators, isExplicitLambdaParameter, isUniqueMethodInvocation, putIntoBraces, rejectAndConcat, rejectAndJoin, rejectAndJoinSeps, sortAnnotationIdentifier, sortNodes, sortTokens } from "./printer-utils.js";
 const { breakParent, conditionalGroup, ifBreak, label, line, lineSuffixBoundary, softline } = builders;
 const { removeLines, willBreak } = utils;
 export class ExpressionsPrettierVisitor extends BaseCstPrettierPrinter {
@@ -125,6 +125,7 @@ export class ExpressionsPrettierVisitor extends BaseCstPrettierPrinter {
         return binaryExpression;
     }
     binaryExpression(ctx, params) {
+        var _a, _b, _c, _d;
         handleCommentsBinaryExpression(ctx);
         const sortedNodes = sortNodes([
             ctx.pattern,
@@ -132,15 +133,38 @@ export class ExpressionsPrettierVisitor extends BaseCstPrettierPrinter {
             ctx.expression,
             ctx.unaryExpression
         ]);
-        const nodes = this.mapVisit(sortedNodes, sortedNodes.length === 1 ? params : undefined);
-        const tokens = sortTokens([
-            ctx.Instanceof,
-            ctx.AssignmentOperator,
-            ctx.Less,
-            ctx.Greater,
-            ctx.BinaryOperator
-        ]);
+        const tokens = sortTokens(getOperators(ctx));
         const hasTokens = tokens.length > 0;
+        const nodeParams = sortedNodes.length === 1 ? params : undefined;
+        const nodes = [];
+        for (let i = 0; i < sortedNodes.length; i++) {
+            const node = this.visit(sortedNodes[i], nodeParams);
+            const isAssignment = ((_b = (_a = tokens[i]) === null || _a === void 0 ? void 0 : _a.tokenType.CATEGORIES) === null || _b === void 0 ? void 0 : _b.find(({ name }) => name === "AssignmentOperator")) !== undefined;
+            if (!isAssignment) {
+                nodes.push(node);
+                continue;
+            }
+            const [equals] = tokens.splice(i, 1);
+            const expression = sortedNodes[++i];
+            const nextNode = this.visit(expression);
+            const conditionalExpression = (_c = expression.children.conditionalExpression) === null || _c === void 0 ? void 0 : _c[0].children;
+            const binaryExpression = (_d = conditionalExpression === null || conditionalExpression === void 0 ? void 0 : conditionalExpression.binaryExpression) === null || _d === void 0 ? void 0 : _d[0].children;
+            const breakAfterOperator = (conditionalExpression === null || conditionalExpression === void 0 ? void 0 : conditionalExpression.QuestionMark) === undefined &&
+                binaryExpression !== undefined &&
+                getOperators(binaryExpression).length > 0;
+            if (breakAfterOperator) {
+                nodes.push(concat([node, " ", equals, group(indent([line, nextNode]))]));
+                continue;
+            }
+            const groupId = Symbol("assignment");
+            nodes.push(concat([
+                node,
+                " ",
+                equals,
+                indent(group(line, { id: groupId })),
+                indentIfBreak(nextNode, { groupId })
+            ]));
+        }
         const content = binary(nodes, tokens, true);
         return hasTokens && (params === null || params === void 0 ? void 0 : params.addParenthesisToWrapStatement)
             ? group(concat([

package/dist/printers/printer-utils.js

@@ -8,7 +8,7 @@ import { isCstNode } from "../types/utils.js";
 import { isEmptyDoc } from "../utils/index.js";
 import { hasComments, hasLeadingComments, hasTrailingComments } from "./comments/comments-utils.js";
 import { getTokenLeadingComments, printTokenWithComments } from "./comments/format-comments.js";
-import { concat, group, ifBreak, indentIfBreak, join } from "./prettier-builder.js";
+import { concat, group, ifBreak, join } from "./prettier-builder.js";
 const { indent, hardline, line, lineSuffixBoundary, softline } = builders;
 const orderedModifiers = [
     "Public",
@@ -456,14 +456,16 @@ export function binary(nodes, tokens, isRoot = false) {
         }
     }
     level.push(nodes.shift());
-    const lineGroupId = Symbol("line");
-    return group(levelOperator === "="
-        ? [
-            level[0],
-            indent(group(line, { id: lineGroupId })),
-            indentIfBreak(level[1], { groupId: lineGroupId })
-        ]
-        : join(line, level));
+    return group(join(line, level));
+}
+export function getOperators(ctx) {
+    return [
+        ctx.AssignmentOperator,
+        ctx.BinaryOperator,
+        ctx.Greater,
+        ctx.Instanceof,
+        ctx.Less
+    ].filter(token => token !== undefined);
 }
 function getOperator(tokens) {
     if (!tokens.length) {

package/dist/utils/expressions-utils.js

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,18 @@
+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

package/index.d.ts

@@ -0,0 +1,4 @@
+import type { Plugin } from "prettier";
+
+declare const plugin: Plugin;
+export default plugin;

package/package.json

@@ -1,19 +1,24 @@
 {
   "name": "prettier-plugin-java",
-  "version": "2.6.4",
+  "version": "2.6.6",
   "description": "Prettier Java Plugin",
   "type": "module",
-  "exports": "./dist/index.js",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
   "files": [
-    "dist"
+    "dist",
+    "index.d.ts"
   ],
   "homepage": "https://jhipster.github.io/prettier-java/",
   "repository": "https://github.com/jhipster/prettier-java",
   "license": "Apache-2.0",
   "dependencies": {
-    "java-parser": "2.3.2",
-    "lodash": "4.17.21",
-    "prettier": "3.2.5"
+    "java-parser": "2.3.3",
+    "lodash": "4.17.21"
   },
   "scripts": {
     "test": "yarn run test:unit && yarn run test:e2e-core",
@@ -28,15 +33,18 @@
   },
   "devDependencies": {
     "@chevrotain/types": "11.0.3",
-    "@types/chai": "4.3.4",
-    "@types/fs-extra": "9.0.13",
-    "@types/jest": "29.2.3",
-    "@types/klaw-sync": "6.0.1",
-    "@types/lodash": "4.14.190",
-    "@types/node": "18.11.9",
-    "@types/sinon": "10.0.13",
-    "ts-node": "10.9.1",
-    "typescript": "4.9.3"
+    "@types/chai": "5.0.1",
+    "@types/fs-extra": "11.0.4",
+    "@types/jest": "29.5.14",
+    "@types/klaw-sync": "6.0.5",
+    "@types/lodash": "4.17.13",
+    "@types/node": "18.19.64",
+    "@types/sinon": "17.0.3",
+    "ts-node": "10.9.2",
+    "typescript": "5.6.3"
+  },
+  "peerDependencies": {
+    "prettier": "^3.0.0"
   },
-  "gitHead": "d18871d1ec1cc2c4b841d13d4e3e432dc7133d8b"
+  "gitHead": "b80f28061b45d46df03c441ff3af3d68e84b3c23"
 }