prettier-plugin-java 2.4.0 → 2.6.0

package/dist/printers/types-values-and-variables.js

@@ -1,191 +1,153 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypesValuesAndVariablesPrettierVisitor = void 0;
-var forEach_1 = __importDefault(require("lodash/forEach"));
-var doc_1 = require("prettier/doc");
-var prettier_builder_1 = require("./prettier-builder");
-var format_comments_1 = require("./comments/format-comments");
-var printer_utils_1 = require("./printer-utils");
-var base_cst_printer_1 = require("../base-cst-printer");
-var utils_1 = require("../types/utils");
-var line = doc_1.builders.line, softline = doc_1.builders.softline;
-var TypesValuesAndVariablesPrettierVisitor = /** @class */ (function (_super) {
-    __extends(TypesValuesAndVariablesPrettierVisitor, _super);
-    function TypesValuesAndVariablesPrettierVisitor() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    TypesValuesAndVariablesPrettierVisitor.prototype.primitiveType = function (ctx) {
-        var annotations = this.mapVisit(ctx.annotation);
-        var type = ctx.numericType
+import forEach from "lodash/forEach.js";
+import { builders } from "prettier/doc";
+import { concat, group, indent, join } from "./prettier-builder.js";
+import { printTokenWithComments } from "./comments/format-comments.js";
+import { putIntoBraces, rejectAndConcat, rejectAndJoin, rejectAndJoinSeps, sortClassTypeChildren } from "./printer-utils.js";
+import { BaseCstPrettierPrinter } from "../base-cst-printer.js";
+import { isAnnotationCstNode, isCstNode, isTypeArgumentsCstNode } from "../types/utils.js";
+const { line, softline } = builders;
+export class TypesValuesAndVariablesPrettierVisitor extends BaseCstPrettierPrinter {
+    primitiveType(ctx) {
+        const annotations = this.mapVisit(ctx.annotation);
+        const type = ctx.numericType
             ? this.visit(ctx.numericType)
             : this.getSingle(ctx);
-        return (0, printer_utils_1.rejectAndJoin)(" ", [(0, prettier_builder_1.join)(" ", annotations), type]);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.numericType = function (ctx) {
+        return rejectAndJoin(" ", [join(" ", annotations), type]);
+    }
+    numericType(ctx) {
         return this.visitSingle(ctx);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.integralType = function (ctx) {
-        return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.floatingPointType = function (ctx) {
-        return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.referenceType = function (ctx) {
-        var annotations = this.mapVisit(ctx.annotation);
-        var type = ctx.primitiveType
+    }
+    integralType(ctx) {
+        return printTokenWithComments(this.getSingle(ctx));
+    }
+    floatingPointType(ctx) {
+        return printTokenWithComments(this.getSingle(ctx));
+    }
+    referenceType(ctx) {
+        const annotations = this.mapVisit(ctx.annotation);
+        const type = ctx.primitiveType
             ? this.visit(ctx.primitiveType)
             : this.visit(ctx.classOrInterfaceType);
-        var dims = this.visit(ctx.dims);
-        return (0, printer_utils_1.rejectAndJoin)(" ", [(0, prettier_builder_1.join)(" ", annotations), (0, prettier_builder_1.concat)([type, dims])]);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.classOrInterfaceType = function (ctx) {
+        const dims = this.visit(ctx.dims);
+        return rejectAndJoin(" ", [join(" ", annotations), concat([type, dims])]);
+    }
+    classOrInterfaceType(ctx) {
         return this.visitSingle(ctx);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.classType = function (ctx) {
-        var _this = this;
-        var tokens = (0, printer_utils_1.sortClassTypeChildren)(ctx.annotation, ctx.typeArguments, ctx.Identifier);
-        var segments = [];
-        var currentSegment = [];
-        (0, forEach_1.default)(tokens, function (token, i) {
-            if ((0, utils_1.isTypeArgumentsCstNode)(token)) {
-                currentSegment.push(_this.visit([token]));
-                segments.push((0, printer_utils_1.rejectAndConcat)(currentSegment));
+    }
+    classType(ctx) {
+        const tokens = sortClassTypeChildren(ctx.annotation, ctx.typeArguments, ctx.Identifier);
+        const segments = [];
+        let currentSegment = [];
+        forEach(tokens, (token, i) => {
+            if (isTypeArgumentsCstNode(token)) {
+                currentSegment.push(this.visit([token]));
+                segments.push(rejectAndConcat(currentSegment));
                 currentSegment = [];
             }
-            else if ((0, utils_1.isAnnotationCstNode)(token)) {
-                currentSegment.push(_this.visit([token]), " ");
+            else if (isAnnotationCstNode(token)) {
+                currentSegment.push(this.visit([token]), " ");
             }
             else {
                 currentSegment.push(token);
-                if ((i + 1 < tokens.length && !(0, utils_1.isTypeArgumentsCstNode)(tokens[i + 1])) ||
+                if ((i + 1 < tokens.length && !isTypeArgumentsCstNode(tokens[i + 1])) ||
                     i + 1 === tokens.length) {
-                    segments.push((0, printer_utils_1.rejectAndConcat)(currentSegment));
+                    segments.push(rejectAndConcat(currentSegment));
                     currentSegment = [];
                 }
             }
         });
-        return (0, printer_utils_1.rejectAndJoinSeps)(ctx.Dot, segments);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.interfaceType = function (ctx) {
+        return rejectAndJoinSeps(ctx.Dot, segments);
+    }
+    interfaceType(ctx) {
         return this.visitSingle(ctx);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.typeVariable = function (ctx) {
-        var annotations = this.mapVisit(ctx.annotation);
-        var identifier = this.getSingle(ctx);
-        return (0, printer_utils_1.rejectAndJoin)(" ", [(0, prettier_builder_1.join)(" ", annotations), identifier]);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.dims = function (ctx) {
-        var _this = this;
-        var tokens = __spreadArray([], ctx.LSquare, true);
+    }
+    typeVariable(ctx) {
+        const annotations = this.mapVisit(ctx.annotation);
+        const identifier = this.getSingle(ctx);
+        return rejectAndJoin(" ", [join(" ", annotations), identifier]);
+    }
+    dims(ctx) {
+        let tokens = [...ctx.LSquare];
         if (ctx.annotation) {
-            tokens = __spreadArray(__spreadArray([], tokens, true), ctx.annotation, true);
+            tokens = [...tokens, ...ctx.annotation];
         }
-        tokens = tokens.sort(function (a, b) {
-            var startOffset1 = (0, utils_1.isCstNode)(a)
+        tokens = tokens.sort((a, b) => {
+            const startOffset1 = isCstNode(a)
                 ? a.children.At[0].startOffset
                 : a.startOffset;
-            var startOffset2 = (0, utils_1.isCstNode)(b)
+            const startOffset2 = isCstNode(b)
                 ? b.children.At[0].startOffset
                 : b.startOffset;
             return startOffset1 - startOffset2;
         });
-        var segments = [];
-        var currentSegment = [];
-        (0, forEach_1.default)(tokens, function (token) {
-            if ((0, utils_1.isCstNode)(token)) {
-                currentSegment.push(_this.visit([token]));
+        const segments = [];
+        let currentSegment = [];
+        forEach(tokens, token => {
+            if (isCstNode(token)) {
+                currentSegment.push(this.visit([token]));
             }
             else {
-                segments.push((0, printer_utils_1.rejectAndConcat)([
-                    (0, printer_utils_1.rejectAndJoin)(" ", currentSegment),
-                    (0, prettier_builder_1.concat)([ctx.LSquare[0], ctx.RSquare[0]])
+                segments.push(rejectAndConcat([
+                    rejectAndJoin(" ", currentSegment),
+                    concat([ctx.LSquare[0], ctx.RSquare[0]])
                 ]));
                 currentSegment = [];
             }
         });
-        return (0, printer_utils_1.rejectAndConcat)(segments);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.typeParameter = function (ctx) {
-        var typeParameterModifiers = this.mapVisit(ctx.typeParameterModifier);
-        var typeIdentifier = this.visit(ctx.typeIdentifier);
-        var typeBound = this.visit(ctx.typeBound);
-        return (0, printer_utils_1.rejectAndJoin)(" ", [
-            (0, prettier_builder_1.join)(" ", typeParameterModifiers),
+        return rejectAndConcat(segments);
+    }
+    typeParameter(ctx) {
+        const typeParameterModifiers = this.mapVisit(ctx.typeParameterModifier);
+        const typeIdentifier = this.visit(ctx.typeIdentifier);
+        const typeBound = this.visit(ctx.typeBound);
+        return rejectAndJoin(" ", [
+            join(" ", typeParameterModifiers),
             typeIdentifier,
             typeBound
         ]);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.typeParameterModifier = function (ctx) {
+    }
+    typeParameterModifier(ctx) {
         return this.visitSingle(ctx);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.typeBound = function (ctx) {
-        var classOrInterfaceType = this.visit(ctx.classOrInterfaceType);
-        var additionalBound = this.mapVisit(ctx.additionalBound);
-        return (0, prettier_builder_1.concat)([
-            (0, printer_utils_1.rejectAndJoin)(" ", [ctx.Extends[0], classOrInterfaceType]),
-            (0, prettier_builder_1.indent)((0, prettier_builder_1.group)((0, prettier_builder_1.concat)([
+    }
+    typeBound(ctx) {
+        const classOrInterfaceType = this.visit(ctx.classOrInterfaceType);
+        const additionalBound = this.mapVisit(ctx.additionalBound);
+        return concat([
+            rejectAndJoin(" ", [ctx.Extends[0], classOrInterfaceType]),
+            indent(group(concat([
                 additionalBound.length ? line : "",
-                (0, printer_utils_1.rejectAndJoin)(line, additionalBound)
+                rejectAndJoin(line, additionalBound)
             ])))
         ]);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.additionalBound = function (ctx) {
-        var interfaceType = this.visit(ctx.interfaceType);
-        return (0, prettier_builder_1.join)(" ", [ctx.And[0], interfaceType]);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.typeArguments = function (ctx) {
-        var typeArgumentList = this.visit(ctx.typeArgumentList);
-        return (0, printer_utils_1.putIntoBraces)(typeArgumentList, softline, ctx.Less[0], ctx.Greater[0]);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.typeArgumentList = function (ctx) {
-        var typeArguments = this.mapVisit(ctx.typeArgument);
-        var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return (0, prettier_builder_1.concat)([elt, line]); }) : [];
-        return (0, printer_utils_1.rejectAndJoinSeps)(commas, typeArguments);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.typeArgument = function (ctx) {
+    }
+    additionalBound(ctx) {
+        const interfaceType = this.visit(ctx.interfaceType);
+        return join(" ", [ctx.And[0], interfaceType]);
+    }
+    typeArguments(ctx) {
+        const typeArgumentList = this.visit(ctx.typeArgumentList);
+        return putIntoBraces(typeArgumentList, softline, ctx.Less[0], ctx.Greater[0]);
+    }
+    typeArgumentList(ctx) {
+        const typeArguments = this.mapVisit(ctx.typeArgument);
+        const commas = ctx.Comma ? ctx.Comma.map(elt => concat([elt, line])) : [];
+        return rejectAndJoinSeps(commas, typeArguments);
+    }
+    typeArgument(ctx) {
         return this.visitSingle(ctx);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.wildcard = function (ctx) {
-        var annotations = this.mapVisit(ctx.annotation);
-        var wildcardBounds = this.visit(ctx.wildcardBounds);
-        return (0, printer_utils_1.rejectAndJoin)(" ", [
-            (0, prettier_builder_1.join)(" ", annotations),
+    }
+    wildcard(ctx) {
+        const annotations = this.mapVisit(ctx.annotation);
+        const wildcardBounds = this.visit(ctx.wildcardBounds);
+        return rejectAndJoin(" ", [
+            join(" ", annotations),
             ctx.QuestionMark[0],
             wildcardBounds
         ]);
-    };
-    TypesValuesAndVariablesPrettierVisitor.prototype.wildcardBounds = function (ctx) {
-        var keyWord = ctx.Extends ? ctx.Extends[0] : ctx.Super[0];
-        var referenceType = this.visit(ctx.referenceType);
-        return (0, prettier_builder_1.join)(" ", [keyWord, referenceType]);
-    };
-    return TypesValuesAndVariablesPrettierVisitor;
-}(base_cst_printer_1.BaseCstPrettierPrinter));
-exports.TypesValuesAndVariablesPrettierVisitor = TypesValuesAndVariablesPrettierVisitor;
+    }
+    wildcardBounds(ctx) {
+        const keyWord = ctx.Extends ? ctx.Extends[0] : ctx.Super[0];
+        const referenceType = this.visit(ctx.referenceType);
+        return join(" ", [keyWord, referenceType]);
+    }
+}

package/dist/types/utils.js

@@ -1,29 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isOrdinaryCompilationUnitCtx = exports.isAnnotationCstNode = exports.isTypeArgumentsCstNode = exports.isCstElementOrUndefinedIToken = exports.isIToken = exports.isCstNode = void 0;
-function isCstNode(tokenOrNode) {
+export function isCstNode(tokenOrNode) {
     return !isIToken(tokenOrNode);
 }
-exports.isCstNode = isCstNode;
-function isIToken(tokenOrNode) {
+export function isIToken(tokenOrNode) {
     return (tokenOrNode.tokenType !== undefined &&
         tokenOrNode.image !== undefined);
 }
-exports.isIToken = isIToken;
-function isCstElementOrUndefinedIToken(tokenOrNode) {
+export function isCstElementOrUndefinedIToken(tokenOrNode) {
     return tokenOrNode !== undefined && isIToken(tokenOrNode);
 }
-exports.isCstElementOrUndefinedIToken = isCstElementOrUndefinedIToken;
-var isTypeArgumentsCstNode = function (cstElement) {
+export const isTypeArgumentsCstNode = (cstElement) => {
     return cstElement.name === "typeArguments";
 };
-exports.isTypeArgumentsCstNode = isTypeArgumentsCstNode;
-var isAnnotationCstNode = function (cstElement) {
+export const isAnnotationCstNode = (cstElement) => {
     return cstElement.name === "annotation";
 };
-exports.isAnnotationCstNode = isAnnotationCstNode;
-var isOrdinaryCompilationUnitCtx = function (ctx) {
+export const isOrdinaryCompilationUnitCtx = (ctx) => {
     return (ctx.ordinaryCompilationUnit !==
         undefined);
 };
-exports.isOrdinaryCompilationUnitCtx = isOrdinaryCompilationUnitCtx;

package/dist/utils/expressions-utils.js

@@ -1,29 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSingleArgumentLambdaExpressionWithBlock = exports.isArgumentListSingleLambda = void 0;
-function isArgumentListSingleLambda(argumentList) {
+export function isArgumentListSingleLambda(argumentList) {
     if (argumentList === undefined) {
         return false;
     }
-    var args = argumentList[0].children.expression;
+    const args = argumentList[0].children.expression;
     if (args.length !== 1) {
         return false;
     }
-    var argument = args[0];
+    const argument = args[0];
     return argument.children.lambdaExpression !== undefined;
 }
-exports.isArgumentListSingleLambda = isArgumentListSingleLambda;
-var isSingleArgumentLambdaExpressionWithBlock = function (argumentList) {
+export const isSingleArgumentLambdaExpressionWithBlock = (argumentList) => {
     if (argumentList === undefined) {
         return false;
     }
-    var args = argumentList[0].children.expression;
+    const args = argumentList[0].children.expression;
     if (args.length !== 1) {
         return false;
     }
-    var argument = args[0];
+    const argument = args[0];
     return (argument.children.lambdaExpression !== undefined &&
         argument.children.lambdaExpression[0].children.lambdaBody[0].children
             .block !== undefined);
 };
-exports.isSingleArgumentLambdaExpressionWithBlock = isSingleArgumentLambdaExpressionWithBlock;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhwcmVzc2lvbnMtdXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvZXhwcmVzc2lvbnMtdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsTUFBTSxVQUFVLDBCQUEwQixDQUN4QyxZQUErQztJQUUvQyxJQUFJLFlBQVksS0FBSyxTQUFTLEVBQUU7UUFDOUIsT0FBTyxLQUFLLENBQUM7S0FDZDtJQUVELE1BQU0sSUFBSSxHQUFHLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2pELElBQUksSUFBSSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7UUFDckIsT0FBTyxLQUFLLENBQUM7S0FDZDtJQUVELE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN6QixPQUFPLFFBQVEsQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLEtBQUssU0FBUyxDQUFDO0FBQzFELENBQUM7QUFFRCxNQUFNLENBQUMsTUFBTSx5Q0FBeUMsR0FBRyxDQUN2RCxZQUErQyxFQUMvQyxFQUFFO0lBQ0YsSUFBSSxZQUFZLEtBQUssU0FBUyxFQUFFO1FBQzlCLE9BQU8sS0FBSyxDQUFDO0tBQ2Q7SUFFRCxNQUFNLElBQUksR0FBRyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQztJQUNqRCxJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1FBQ3JCLE9BQU8sS0FBSyxDQUFDO0tBQ2Q7SUFFRCxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDekIsT0FBTyxDQUNMLFFBQVEsQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLEtBQUssU0FBUztRQUNoRCxRQUFRLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUTthQUNsRSxLQUFLLEtBQUssU0FBUyxDQUN2QixDQUFDO0FBQ0osQ0FBQyxDQUFDIn0=

package/dist/utils/index.js

@@ -1,12 +1,2 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEmptyDoc = exports.printSingleLambdaInvocation = exports.printArgumentListWithBraces = void 0;
-var printArgumentListWithBraces_1 = require("./printArgumentListWithBraces");
-Object.defineProperty(exports, "printArgumentListWithBraces", { enumerable: true, get: function () { return __importDefault(printArgumentListWithBraces_1).default; } });
-var printSingleLambdaInvocation_1 = require("./printSingleLambdaInvocation");
-Object.defineProperty(exports, "printSingleLambdaInvocation", { enumerable: true, get: function () { return __importDefault(printSingleLambdaInvocation_1).default; } });
-var isEmptyDoc_1 = require("./isEmptyDoc");
-Object.defineProperty(exports, "isEmptyDoc", { enumerable: true, get: function () { return __importDefault(isEmptyDoc_1).default; } });
+export { default as printArgumentListWithBraces } from "./printArgumentListWithBraces.js";
+export { default as isEmptyDoc } from "./isEmptyDoc.js";

package/dist/utils/isEmptyDoc.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var isEmptyDoc = function (argument) {
+const isEmptyDoc = (argument) => {
     return argument === "" || (Array.isArray(argument) && argument.length) === 0;
 };
-exports.default = isEmptyDoc;
+export default isEmptyDoc;

package/dist/utils/printArgumentListWithBraces.js

@@ -1,21 +1,31 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var doc_1 = require("prettier/doc");
-var expressions_utils_1 = require("./expressions-utils");
-var printer_utils_1 = require("../printers/printer-utils");
-var printSingleLambdaInvocation_1 = __importDefault(require("./printSingleLambdaInvocation"));
-var softline = doc_1.builders.softline;
-function printArgumentListWithBraces(argumentListCtx, rBrace, lBrace) {
-    var isSingleLambda = (0, expressions_utils_1.isArgumentListSingleLambda)(argumentListCtx);
-    if (isSingleLambda) {
-        return printSingleLambdaInvocation_1.default.call(this, argumentListCtx, rBrace, lBrace);
+import { builders, utils } from "prettier/doc";
+import { putIntoBraces } from "../printers/printer-utils.js";
+const { breakParent, conditionalGroup, softline } = builders;
+const { willBreak } = utils;
+export default function printArgumentListWithBraces(argumentListNodes, rBrace, lBrace) {
+    if (argumentListNodes &&
+        !argumentListNodes[0].leadingComments &&
+        !rBrace.leadingComments &&
+        isArgumentListHuggable(argumentListNodes[0].children)) {
+        const [flat, expanded] = [false, true].map(shouldBreak => {
+            const argumentList = this.visit(argumentListNodes, {
+                isHuggable: true,
+                shouldBreak
+            });
+            return putIntoBraces(argumentList, "", lBrace, rBrace);
+        });
+        return [
+            willBreak(flat) ? breakParent : "",
+            conditionalGroup([flat, expanded])
+        ];
     }
-    var argumentList = this.visit(argumentListCtx, {
-        isInsideMethodInvocationSuffix: true
-    });
-    return (0, printer_utils_1.putIntoBraces)(argumentList, softline, lBrace, rBrace);
+    const argumentList = this.visit(argumentListNodes);
+    return putIntoBraces(argumentList, softline, lBrace, rBrace);
+}
+function isArgumentListHuggable(argumentList) {
+    var _a;
+    const expressions = argumentList.expression;
+    return ((expressions.length === 1 ||
+        ((_a = expressions[expressions.length - 1].children.lambdaExpression) === null || _a === void 0 ? void 0 : _a[0].children.lambdaBody[0].children.block) !== undefined) &&
+        expressions.filter(({ children }) => children.lambdaExpression).length === 1);
 }
-exports.default = printArgumentListWithBraces;

package/dist/utils/printSingleLambdaInvocation.js

@@ -1,20 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var doc_1 = require("prettier/doc");
-var expressions_utils_1 = require("./expressions-utils");
-var format_comments_1 = require("../printers/comments/format-comments");
-var prettier_builder_1 = require("../printers/prettier-builder");
-var printer_utils_1 = require("../printers/printer-utils");
-var softline = doc_1.builders.softline, ifBreak = doc_1.builders.ifBreak;
-function printSingleLambdaInvocation(argumentListCtx, rBrace, lBrace) {
-    var lambdaParametersGroupId = Symbol("lambdaParameters");
-    var argumentList = this.visit(argumentListCtx, {
-        lambdaParametersGroupId: lambdaParametersGroupId,
+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
     });
-    var formattedRBrace = (0, expressions_utils_1.isSingleArgumentLambdaExpressionWithBlock)(argumentListCtx)
-        ? ifBreak((0, prettier_builder_1.indent)((0, prettier_builder_1.concat)([softline, rBrace])), (0, format_comments_1.printTokenWithComments)(rBrace), { groupId: lambdaParametersGroupId })
-        : (0, prettier_builder_1.indent)((0, prettier_builder_1.concat)([softline, rBrace]));
-    return (0, prettier_builder_1.dedent)((0, printer_utils_1.putIntoBraces)(argumentList, "", lBrace, formattedRBrace));
+    const formattedRBrace = isSingleArgumentLambdaExpressionWithBlock(argumentListCtx)
+        ? ifBreak(indent(concat([softline, rBrace])), printTokenWithComments(rBrace), { groupId: lambdaParametersGroupId })
+        : indent(concat([softline, rBrace]));
+    return dedent(putIntoBraces(argumentList, "", lBrace, formattedRBrace));
 }
-exports.default = printSingleLambdaInvocation;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpbnRTaW5nbGVMYW1iZGFJbnZvY2F0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3ByaW50U2luZ2xlTGFtYmRhSW52b2NhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sRUFBRSx5Q0FBeUMsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ25GLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ2pGLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3pFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUU3RCxNQUFNLEVBQUUsUUFBUSxFQUFFLE9BQU8sRUFBRSxHQUFHLFFBQVEsQ0FBQztBQUV2QyxNQUFNLENBQUMsT0FBTyxVQUFVLDJCQUEyQixDQUNqRCxlQUFrRCxFQUNsRCxNQUFjLEVBQ2QsTUFBYztJQUVkLE1BQU0sdUJBQXVCLEdBQUcsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUM7SUFDM0QsTUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxlQUFlLEVBQUU7UUFDL0MsdUJBQXVCO1FBQ3ZCLDhCQUE4QixFQUFFLElBQUk7S0FDckMsQ0FBQyxDQUFDO0lBRUgsTUFBTSxlQUFlLEdBQUcseUNBQXlDLENBQy9ELGVBQWUsQ0FDaEI7UUFDQyxDQUFDLENBQUMsT0FBTyxDQUNMLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUNsQyxzQkFBc0IsQ0FBQyxNQUFNLENBQUMsRUFDOUIsRUFBRSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsQ0FDckM7UUFDSCxDQUFDLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdkMsT0FBTyxNQUFNLENBQUMsYUFBYSxDQUFDLFlBQVksRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLGVBQWUsQ0FBQyxDQUFDLENBQUM7QUFDMUUsQ0FBQyJ9

package/package.json

@@ -1,17 +1,19 @@
 {
   "name": "prettier-plugin-java",
-  "version": "2.4.0",
+  "version": "2.6.0",
   "description": "Prettier Java Plugin",
-  "main": "dist/index.js",
+  "type": "module",
+  "exports": "./dist/index.js",
   "files": [
     "dist"
   ],
+  "homepage": "https://jhipster.github.io/prettier-java/",
   "repository": "https://github.com/jhipster/prettier-java",
   "license": "Apache-2.0",
   "dependencies": {
-    "java-parser": "2.1.0",
+    "java-parser": "2.3.0",
     "lodash": "4.17.21",
-    "prettier": "3.0.3"
+    "prettier": "3.2.5"
   },
   "scripts": {
     "test": "yarn run test:unit && yarn run test:e2e-core",
@@ -21,16 +23,11 @@
     "test:e2e-jhipster2": "node scripts/clone-samples e2e-jhipster2 && mocha \"test/repository-test/jhipster-2-test.ts\"",
     "test:all": "yarn run test && yarn run test:e2e-jhipster1 && yarn run test:e2e-jhipster2",
     "clone-samples": "node scripts/clone-samples.js",
-    "build": "tsc -p tsconfig.build.json --outDir dist",
-    "build:watch": "tsc -p tsconfig.build.json --inlineSourceMap --outDir dist -w"
+    "build": "tsc",
+    "build:watch": "tsc --inlineSourceMap -w"
   },
   "devDependencies": {
-    "@babel/cli": "7.19.3",
-    "@babel/core": "7.20.2",
-    "@babel/preset-env": "7.20.2",
-    "@babel/preset-typescript": "7.18.6",
-    "@babel/register": "7.18.9",
-    "@chevrotain/types": "9.0.2",
+    "@chevrotain/types": "11.0.3",
     "@types/chai": "4.3.4",
     "@types/fs-extra": "9.0.13",
     "@types/jest": "29.2.3",
@@ -41,5 +38,5 @@
     "ts-node": "10.9.1",
     "typescript": "4.9.3"
   },
-  "gitHead": "acdd5e7f28d08c4fb0351cfaf43d4ff9524b90ba"
+  "gitHead": "30e1cad12e8936df43c25eeb9dad5aef20d9af6c"
 }

package/dist/src/base-cst-printer.js

@@ -1,77 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseCstPrettierPrinter = void 0;
-var java_parser_1 = require("java-parser");
-var format_comments_1 = require("./printers/comments/format-comments");
-var BaseCstPrettierPrinter = /** @class */ (function (_super) {
-    __extends(BaseCstPrettierPrinter, _super);
-    function BaseCstPrettierPrinter() {
-        var _this = _super.call(this) || this;
-        _this.mapVisit = function (elements, params) {
-            if (elements === undefined) {
-                // TODO: can optimize this by returning an immutable empty array singleton.
-                return [];
-            }
-            return elements.map(function (element) { return _this.visit(element, params); });
-        };
-        _this.getSingle = function (ctx) {
-            var ctxKeys = Object.keys(ctx);
-            if (ctxKeys.length !== 1) {
-                throw Error("Expecting single key CST ctx but found: <" + ctxKeys.length + "> keys");
-            }
-            var singleElementKey = ctxKeys[0];
-            var singleElementValues = ctx[singleElementKey];
-            if ((singleElementValues === null || singleElementValues === void 0 ? void 0 : singleElementValues.length) !== 1) {
-                throw Error("Expecting single item in CST ctx key but found: <" + (singleElementValues === null || singleElementValues === void 0 ? void 0 : singleElementValues.length) + "> items");
-            }
-            return singleElementValues[0];
-        };
-        // @ts-ignore
-        _this.orgVisit = _this.visit;
-        _this.visit = function (ctx, inParam) {
-            if (ctx === undefined) {
-                // empty Doc
-                return "";
-            }
-            var node = Array.isArray(ctx) ? ctx[0] : ctx;
-            if (node.ignore) {
-                try {
-                    var startOffset = node.leadingComments !== undefined
-                        ? node.leadingComments[0].startOffset
-                        : node.location.startOffset;
-                    var endOffset = (node.trailingComments !== undefined
-                        ? node.trailingComments[node.trailingComments.length - 1].endOffset
-                        : node.location.endOffset);
-                    return this.prettierOptions.originalText.substring(startOffset, endOffset + 1);
-                }
-                catch (e) {
-                    throw Error(e +
-                        "\nThere might be a problem with prettier-ignore, please report an issue on https://github.com/jhipster/prettier-java/issues");
-                }
-            }
-            return format_comments_1.printNodeWithComments(node, this.orgVisit.call(this, node, inParam));
-        };
-        _this.visitSingle = function (ctx, params) {
-            var singleElement = this.getSingle(ctx);
-            return this.visit(singleElement, params);
-        };
-        return _this;
-    }
-    return BaseCstPrettierPrinter;
-}(java_parser_1.BaseJavaCstVisitor));
-exports.BaseCstPrettierPrinter = BaseCstPrettierPrinter;