prettier-plugin-java 2.1.0 → 2.3.0

package/dist/printers/printer-utils.js

@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printArrayList = exports.isUniqueMethodInvocation = exports.sortImports = exports.isStatementEmptyStatement = exports.isShiftOperator = exports.separateTokensIntoGroups = exports.putIntoBraces = exports.getInterfaceBodyDeclarationsSeparator = exports.getClassBodyDeclarationsSeparator = exports.getBlankLinesSeparator = exports.isExplicitLambdaParameter = exports.displaySemicolon = exports.findDeepElementInPartsArray = exports.sortModifiers = exports.sortClassTypeChildren = exports.matchCategory = exports.sortNodes = exports.sortAnnotationIdentifier = exports.rejectAndConcat = exports.rejectAndJoin = exports.rejectSeparators = exports.reject = exports.rejectAndJoinSeps = exports.buildFqn = void 0;
+exports.printArrayList = exports.isUniqueMethodInvocation = exports.sortImports = exports.isStatementEmptyStatement = exports.binary = exports.putIntoBraces = exports.getInterfaceBodyDeclarationsSeparator = exports.getClassBodyDeclarationsSeparator = exports.getBlankLinesSeparator = exports.isExplicitLambdaParameter = exports.displaySemicolon = exports.findDeepElementInPartsArray = exports.sortModifiers = exports.sortClassTypeChildren = exports.matchCategory = exports.sortNodes = exports.sortTokens = exports.sortAnnotationIdentifier = exports.rejectAndConcat = exports.rejectAndJoin = exports.rejectSeparators = exports.reject = exports.rejectAndJoinSeps = exports.buildFqn = void 0;
 var findIndex_1 = __importDefault(require("lodash/findIndex"));
 var findLastIndex_1 = __importDefault(require("lodash/findLastIndex"));
 var forEach_1 = __importDefault(require("lodash/forEach"));
@@ -131,6 +131,7 @@ function sortTokens(values) {
         return a.startOffset - b.startOffset;
     });
 }
+exports.sortTokens = sortTokens;
 function sortNodes(values) {
     var nodes = [];
     (0, forEach_1.default)(values, function (argument) {
@@ -185,16 +186,17 @@ function sortModifiers(modifiers) {
     var hasOtherModifier = false;
     /**
      * iterate in reverse order because we special-case
-     * method annotations which come after all other
+     * type annotations which come after all other
      * modifiers
      */
     (0, forEachRight_1.default)(modifiers, function (modifier) {
         var isAnnotation = modifier.children.annotation !== undefined;
-        var isMethodAnnotation = isAnnotation &&
+        var isTypeAnnotation = isAnnotation &&
             (modifier.name === "methodModifier" ||
-                modifier.name === "interfaceMethodModifier");
+                modifier.name === "interfaceMethodModifier" ||
+                modifier.name === "fieldModifier");
         if (isAnnotation) {
-            if (isMethodAnnotation && !hasOtherModifier) {
+            if (isTypeAnnotation && !hasOtherModifier) {
                 lastAnnotations.unshift(modifier);
             }
             else {
@@ -335,7 +337,8 @@ function needLineClassBodyDeclaration(declaration) {
     if (classMemberDeclaration.children.fieldDeclaration !== undefined) {
         var fieldDeclaration = classMemberDeclaration.children.fieldDeclaration[0];
         if (fieldDeclaration.children.fieldModifier !== undefined &&
-            hasAnnotation(fieldDeclaration.children.fieldModifier)) {
+            hasAnnotation(fieldDeclaration.children.fieldModifier) &&
+            hasNonTrailingAnnotation(fieldDeclaration.children.fieldModifier)) {
             return true;
         }
         return false;
@@ -349,7 +352,8 @@ function needLineInterfaceMemberDeclaration(declaration) {
     if (declaration.children.constantDeclaration !== undefined) {
         var constantDeclaration = declaration.children.constantDeclaration[0];
         if (constantDeclaration.children.constantModifier !== undefined &&
-            hasAnnotation(constantDeclaration.children.constantModifier)) {
+            hasAnnotation(constantDeclaration.children.constantModifier) &&
+            hasNonTrailingAnnotation(constantDeclaration.children.constantModifier)) {
             return true;
         }
         return false;
@@ -381,15 +385,15 @@ function hasAnnotation(modifiers) {
     return modifiers.some(function (modifier) { return modifier.children.annotation !== undefined; });
 }
 /**
- * Return true if there is a method modifier that does not come after all other modifiers
+ * Return true if there is a modifier that does not come after all other modifiers
  * It is useful to know if sortModifiers will add an annotation before other modifiers
  *
- * @param methodModifiers
+ * @param modifiers
  * @returns {boolean}
  */
-function hasNonTrailingAnnotation(methodModifiers) {
-    var firstAnnotationIndex = (0, findIndex_1.default)(methodModifiers, function (modifier) { return modifier.children.annotation !== undefined; });
-    var lastNonAnnotationIndex = (0, findLastIndex_1.default)(methodModifiers, function (modifier) { return modifier.children.annotation === undefined; });
+function hasNonTrailingAnnotation(modifiers) {
+    var firstAnnotationIndex = (0, findIndex_1.default)(modifiers, function (modifier) { return modifier.children.annotation !== undefined; });
+    var lastNonAnnotationIndex = (0, findLastIndex_1.default)(modifiers, function (modifier) { return modifier.children.annotation === undefined; });
     return (firstAnnotationIndex < lastNonAnnotationIndex ||
         lastNonAnnotationIndex === -1);
 }
@@ -401,15 +405,23 @@ function getInterfaceBodyDeclarationsSeparator(interfaceMemberDeclarationContext
     return getDeclarationsSeparator(interfaceMemberDeclarationContext, needLineInterfaceMemberDeclaration, isInterfaceMemberASemicolon);
 }
 exports.getInterfaceBodyDeclarationsSeparator = getInterfaceBodyDeclarationsSeparator;
+function getAndRemoveLeadingComment(doc) {
+    var isTokenWithLeadingComment = typeof doc !== "string" && "leadingComments" in doc;
+    if (!isTokenWithLeadingComment) {
+        return [];
+    }
+    var leadingComments = (0, format_comments_1.getTokenLeadingComments)(doc);
+    delete doc.leadingComments;
+    return leadingComments;
+}
 function putIntoBraces(argument, separator, LBrace, RBrace) {
-    var rightBraceLeadingComments = (0, format_comments_1.getTokenLeadingComments)(RBrace);
+    var rightBraceLeadingComments = getAndRemoveLeadingComment(RBrace);
     var lastBreakLine = 
     // check if last element of the array is a line
     rightBraceLeadingComments.length !== 0 &&
         rightBraceLeadingComments[rightBraceLeadingComments.length - 1] === hardline
         ? rightBraceLeadingComments.pop()
         : separator;
-    delete RBrace.leadingComments;
     var contentInsideBraces;
     if ((0, utils_2.isEmptyDoc)(argument)) {
         if (rightBraceLeadingComments.length === 0) {
@@ -435,62 +447,117 @@ function putIntoBraces(argument, separator, LBrace, RBrace) {
     ]));
 }
 exports.putIntoBraces = putIntoBraces;
-var andOrBinaryOperators = ["&&", "||", "&", "|", "^"];
-function separateTokensIntoGroups(ctx) {
-    /**
-     * separate tokens into groups by andOrBinaryOperators ("&&", "||", "&", "|", "^")
-     * in order to break those operators in priority.
-     */
-    var tokens = sortTokens([
-        ctx.Instanceof,
-        ctx.AssignmentOperator,
-        ctx.Less,
-        ctx.Greater,
-        ctx.BinaryOperator
-    ]);
-    var groupsOfOperator = [];
-    var sortedBinaryOperators = [];
-    var tmpGroup = [];
-    tokens.forEach(function (token) {
-        if (matchCategory(token, "'BinaryOperator'") &&
-            (0, includes_1.default)(andOrBinaryOperators, token.image)) {
-            sortedBinaryOperators.push(token);
-            groupsOfOperator.push(tmpGroup);
-            tmpGroup = [];
+function binary(nodes, tokens, isRoot) {
+    if (isRoot === void 0) { isRoot = false; }
+    var levelOperator;
+    var levelPrecedence;
+    var level = [];
+    while (tokens.length) {
+        var nextOperator = getOperator(tokens);
+        var nextPrecedence = getOperatorPrecedence(nextOperator);
+        if (levelPrecedence === undefined || nextPrecedence === levelPrecedence) {
+            var tokenLength = ["<<", ">>", ">>>"].includes(nextOperator)
+                ? nextOperator.length
+                : 1;
+            var operator = (0, prettier_builder_1.concat)(tokens.splice(0, tokenLength));
+            if (levelOperator !== undefined &&
+                needsParentheses(levelOperator, nextOperator)) {
+                level.push(nodes.shift());
+                level = [
+                    (0, prettier_builder_1.concat)(["(", (0, prettier_builder_1.group)(indent((0, prettier_builder_1.join)(line, level))), ") ", operator])
+                ];
+            }
+            else {
+                level.push((0, prettier_builder_1.join)(" ", [nodes.shift(), operator]));
+            }
+            levelOperator = nextOperator;
+            levelPrecedence = nextPrecedence;
+        }
+        else if (nextPrecedence < levelPrecedence) {
+            level.push(nodes.shift());
+            if (isRoot) {
+                var content = (0, prettier_builder_1.group)(indent((0, prettier_builder_1.join)(line, level)));
+                nodes.unshift(levelOperator !== undefined &&
+                    needsParentheses(levelOperator, nextOperator)
+                    ? (0, prettier_builder_1.concat)(["(", content, ")"])
+                    : content);
+                level = [];
+                levelOperator = undefined;
+                levelPrecedence = undefined;
+            }
+            else {
+                return (0, prettier_builder_1.group)((0, prettier_builder_1.join)(line, level));
+            }
         }
         else {
-            tmpGroup.push(token);
+            var content = indent(binary(nodes, tokens));
+            nodes.unshift(levelOperator !== undefined &&
+                needsParentheses(nextOperator, levelOperator)
+                ? (0, prettier_builder_1.concat)(["(", content, ")"])
+                : content);
         }
-    });
-    groupsOfOperator.push(tmpGroup);
-    return {
-        groupsOfOperator: groupsOfOperator,
-        sortedBinaryOperators: sortedBinaryOperators
-    };
+    }
+    level.push(nodes.shift());
+    return (0, prettier_builder_1.group)((0, prettier_builder_1.join)(line, level));
 }
-exports.separateTokensIntoGroups = separateTokensIntoGroups;
-function isShiftOperator(tokens, index) {
-    if (tokens.length <= index + 1) {
-        return "none";
-    }
-    if (tokens[index].image === "<" &&
-        tokens[index + 1].image === "<" &&
-        tokens[index].startOffset === tokens[index + 1].startOffset - 1) {
-        return "leftShift";
-    }
-    if (tokens[index].image === ">" &&
-        tokens[index + 1].image === ">" &&
-        tokens[index].startOffset === tokens[index + 1].startOffset - 1) {
-        if (tokens.length > index + 2 &&
-            tokens[index + 2].image === ">" &&
-            tokens[index + 1].startOffset === tokens[index + 2].startOffset - 1) {
-            return "doubleRightShift";
+exports.binary = binary;
+function getOperator(tokens) {
+    if (!tokens.length) {
+        return "";
+    }
+    var _a = tokens[0], image = _a.image, startOffset = _a.startOffset;
+    if (!["<", ">"].includes(image)) {
+        return image;
+    }
+    var repeatedTokenCount = 1;
+    for (var i = 1; i < Math.min(3, tokens.length); i++) {
+        var token = tokens[i];
+        if (token.image !== image || token.startOffset !== startOffset + i) {
+            break;
         }
-        return "rightShift";
+        repeatedTokenCount++;
+    }
+    if (repeatedTokenCount === 1) {
+        return image;
+    }
+    if (image === "<") {
+        return "<<";
     }
-    return "none";
+    else if (repeatedTokenCount == 2) {
+        return ">>";
+    }
+    else {
+        return ">>>";
+    }
+}
+var PRECEDENCES_BY_OPERATOR = new Map([
+    ["||"],
+    ["&&"],
+    ["|"],
+    ["^"],
+    ["&"],
+    ["==", "!="],
+    ["<", ">", "<=", ">=", "instanceof"],
+    ["<<", ">>", ">>>"],
+    ["+", "-"],
+    ["*", "/", "%"]
+].flatMap(function (operators, index) { return operators.map(function (operator) { return [operator, index]; }); }));
+function getOperatorPrecedence(operator) {
+    var _a;
+    return (_a = PRECEDENCES_BY_OPERATOR.get(operator)) !== null && _a !== void 0 ? _a : -1;
+}
+function needsParentheses(operator, parentOperator) {
+    return ((operator === "&&" && parentOperator === "||") ||
+        (["|", "^", "&", "<<", ">>", ">>>"].includes(parentOperator) &&
+            getOperatorPrecedence(operator) >
+                getOperatorPrecedence(parentOperator)) ||
+        [operator, parentOperator].every(function (o) { return ["==", "!="].includes(o); }) ||
+        [operator, parentOperator].every(function (o) { return ["<<", ">>", ">>>"].includes(o); }) ||
+        (operator === "*" && parentOperator === "/") ||
+        (operator === "/" && parentOperator === "*") ||
+        (operator === "%" && ["+", "-", "*", "/"].includes(parentOperator)) ||
+        (["*", "/"].includes(operator) && parentOperator === "%"));
 }
-exports.isShiftOperator = isShiftOperator;
 function isStatementEmptyStatement(statement) {
     return (statement === ";" || (Array.isArray(statement) && statement[0] === ";"));
 }
@@ -570,3 +637,4 @@ function printArrayList(_a) {
     return putIntoBraces(rejectAndConcat([list, optionalComma]), line, LCurly, RCurly);
 }
 exports.printArrayList = printArrayList;
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"printer-utils.js","sourceRoot":"","sources":["../../src/printers/printer-utils.ts"],"names":[],"mappings":"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"}

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

@@ -29,11 +29,13 @@ var __importDefault = (this && this.__importDefault) || function (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() {
@@ -146,10 +148,12 @@ var TypesValuesAndVariablesPrettierVisitor = /** @class */ (function (_super) {
     TypesValuesAndVariablesPrettierVisitor.prototype.typeBound = function (ctx) {
         var classOrInterfaceType = this.visit(ctx.classOrInterfaceType);
         var additionalBound = this.mapVisit(ctx.additionalBound);
-        return (0, printer_utils_1.rejectAndJoin)(" ", [
-            ctx.Extends[0],
-            classOrInterfaceType,
-            (0, prettier_builder_1.join)(" ", 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)([
+                additionalBound.length ? line : "",
+                (0, printer_utils_1.rejectAndJoin)(line, additionalBound)
+            ])))
         ]);
     };
     TypesValuesAndVariablesPrettierVisitor.prototype.additionalBound = function (ctx) {
@@ -158,11 +162,11 @@ var TypesValuesAndVariablesPrettierVisitor = /** @class */ (function (_super) {
     };
     TypesValuesAndVariablesPrettierVisitor.prototype.typeArguments = function (ctx) {
         var typeArgumentList = this.visit(ctx.typeArgumentList);
-        return (0, printer_utils_1.rejectAndConcat)([ctx.Less[0], typeArgumentList, ctx.Greater[0]]);
+        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, " "]); }) : [];
+        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) {
@@ -185,3 +189,4 @@ var TypesValuesAndVariablesPrettierVisitor = /** @class */ (function (_super) {
     return TypesValuesAndVariablesPrettierVisitor;
 }(base_cst_printer_1.BaseCstPrettierPrinter));
 exports.TypesValuesAndVariablesPrettierVisitor = TypesValuesAndVariablesPrettierVisitor;
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"types-values-and-variables.js","sourceRoot":"","sources":["../../src/printers/types-values-and-variables.ts"],"names":[],"mappings":"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"}

package/dist/types/utils.js

@@ -27,3 +27,4 @@ var isOrdinaryCompilationUnitCtx = function (ctx) {
         undefined);
 };
 exports.isOrdinaryCompilationUnitCtx = isOrdinaryCompilationUnitCtx;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdHlwZXMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBVUEsU0FBZ0IsU0FBUyxDQUFDLFdBQXVCO0lBQy9DLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7QUFDaEMsQ0FBQztBQUZELDhCQUVDO0FBRUQsU0FBZ0IsUUFBUSxDQUFDLFdBQXVCO0lBQzlDLE9BQU8sQ0FDSixXQUFzQixDQUFDLFNBQVMsS0FBSyxTQUFTO1FBQzlDLFdBQXNCLENBQUMsS0FBSyxLQUFLLFNBQVMsQ0FDNUMsQ0FBQztBQUNKLENBQUM7QUFMRCw0QkFLQztBQUVELFNBQWdCLDZCQUE2QixDQUMzQyxXQUFtQztJQUVuQyxPQUFPLFdBQVcsS0FBSyxTQUFTLElBQUksUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBQzVELENBQUM7QUFKRCxzRUFJQztBQUVNLElBQU0sc0JBQXNCLEdBQUcsVUFDcEMsVUFBc0I7SUFFdEIsT0FBUSxVQUFzQixDQUFDLElBQUksS0FBSyxlQUFlLENBQUM7QUFDMUQsQ0FBQyxDQUFDO0FBSlcsUUFBQSxzQkFBc0IsMEJBSWpDO0FBRUssSUFBTSxtQkFBbUIsR0FBRyxVQUNqQyxVQUFzQjtJQUV0QixPQUFRLFVBQXNCLENBQUMsSUFBSSxLQUFLLFlBQVksQ0FBQztBQUN2RCxDQUFDLENBQUM7QUFKVyxRQUFBLG1CQUFtQix1QkFJOUI7QUFFSyxJQUFNLDRCQUE0QixHQUFHLFVBQzFDLEdBQXVCO0lBRXZCLE9BQU8sQ0FDSixHQUEwQyxDQUFDLHVCQUF1QjtRQUNuRSxTQUFTLENBQ1YsQ0FBQztBQUNKLENBQUMsQ0FBQztBQVBXLFFBQUEsNEJBQTRCLGdDQU92QyJ9

package/dist/utils/expressions-utils.js

@@ -27,3 +27,4 @@ var isSingleArgumentLambdaExpressionWithBlock = function (argumentList) {
             .block !== undefined);
 };
 exports.isSingleArgumentLambdaExpressionWithBlock = isSingleArgumentLambdaExpressionWithBlock;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhwcmVzc2lvbnMtdXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvZXhwcmVzc2lvbnMtdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsU0FBZ0IsMEJBQTBCLENBQ3hDLFlBQStDO0lBRS9DLElBQUksWUFBWSxLQUFLLFNBQVMsRUFBRTtRQUM5QixPQUFPLEtBQUssQ0FBQztLQUNkO0lBRUQsSUFBTSxJQUFJLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUM7SUFDakQsSUFBSSxJQUFJLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtRQUNyQixPQUFPLEtBQUssQ0FBQztLQUNkO0lBRUQsSUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3pCLE9BQU8sUUFBUSxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsS0FBSyxTQUFTLENBQUM7QUFDMUQsQ0FBQztBQWRELGdFQWNDO0FBRU0sSUFBTSx5Q0FBeUMsR0FBRyxVQUN2RCxZQUErQztJQUUvQyxJQUFJLFlBQVksS0FBSyxTQUFTLEVBQUU7UUFDOUIsT0FBTyxLQUFLLENBQUM7S0FDZDtJQUVELElBQU0sSUFBSSxHQUFHLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDO0lBQ2pELElBQUksSUFBSSxDQUFDLE1BQU0sS0FBSyxDQUFDLEVBQUU7UUFDckIsT0FBTyxLQUFLLENBQUM7S0FDZDtJQUVELElBQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN6QixPQUFPLENBQ0wsUUFBUSxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsS0FBSyxTQUFTO1FBQ2hELFFBQVEsQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRO2FBQ2xFLEtBQUssS0FBSyxTQUFTLENBQ3ZCLENBQUM7QUFDSixDQUFDLENBQUM7QUFsQlcsUUFBQSx5Q0FBeUMsNkNBa0JwRCJ9

package/dist/utils/index.js

@@ -10,3 +10,4 @@ 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; } });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsNkVBQXVGO0FBQTlFLDJKQUFBLE9BQU8sT0FBK0I7QUFDL0MsNkVBQXVGO0FBQTlFLDJKQUFBLE9BQU8sT0FBK0I7QUFDL0MsMkNBQXFEO0FBQTVDLHlIQUFBLE9BQU8sT0FBYyJ9

package/dist/utils/isEmptyDoc.js

@@ -4,3 +4,4 @@ var isEmptyDoc = function (argument) {
     return argument === "" || (Array.isArray(argument) && argument.length) === 0;
 };
 exports.default = isEmptyDoc;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXNFbXB0eURvYy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9pc0VtcHR5RG9jLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBRUEsSUFBTSxVQUFVLEdBQUcsVUFBQyxRQUFhO0lBQy9CLE9BQU8sUUFBUSxLQUFLLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksUUFBUSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztBQUMvRSxDQUFDLENBQUM7QUFFRixrQkFBZSxVQUFVLENBQUMifQ==

package/dist/utils/printArgumentListWithBraces.js

@@ -19,3 +19,4 @@ function printArgumentListWithBraces(argumentListCtx, rBrace, lBrace) {
     return (0, printer_utils_1.putIntoBraces)(argumentList, softline, lBrace, rBrace);
 }
 exports.default = printArgumentListWithBraces;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpbnRBcmd1bWVudExpc3RXaXRoQnJhY2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3ByaW50QXJndW1lbnRMaXN0V2l0aEJyYWNlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUNBLG9DQUF3QztBQUN4Qyx5REFBaUU7QUFDakUsMkRBQTBEO0FBQzFELDhGQUF3RTtBQUVoRSxJQUFBLFFBQVEsR0FBSyxjQUFRLFNBQWIsQ0FBYztBQUU5QixTQUF3QiwyQkFBMkIsQ0FDakQsZUFBa0QsRUFDbEQsTUFBYyxFQUNkLE1BQWM7SUFFZCxJQUFNLGNBQWMsR0FBRyxJQUFBLDhDQUEwQixFQUFDLGVBQWUsQ0FBQyxDQUFDO0lBQ25FLElBQUksY0FBYyxFQUFFO1FBQ2xCLE9BQU8scUNBQTJCLENBQUMsSUFBSSxDQUNyQyxJQUFJLEVBQ0osZUFBZSxFQUNmLE1BQU0sRUFDTixNQUFNLENBQ1AsQ0FBQztLQUNIO0lBRUQsSUFBTSxZQUFZLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxlQUFlLEVBQUU7UUFDL0MsOEJBQThCLEVBQUUsSUFBSTtLQUNyQyxDQUFDLENBQUM7SUFDSCxPQUFPLElBQUEsNkJBQWEsRUFBQyxZQUFZLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztBQUMvRCxDQUFDO0FBbkJELDhDQW1CQyJ9

package/dist/utils/printSingleLambdaInvocation.js

@@ -18,3 +18,4 @@ function printSingleLambdaInvocation(argumentListCtx, rBrace, lBrace) {
     return (0, prettier_builder_1.dedent)((0, printer_utils_1.putIntoBraces)(argumentList, "", lBrace, formattedRBrace));
 }
 exports.default = printSingleLambdaInvocation;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpbnRTaW5nbGVMYW1iZGFJbnZvY2F0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3ByaW50U2luZ2xlTGFtYmRhSW52b2NhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLG9DQUF3QztBQUN4Qyx5REFBZ0Y7QUFDaEYsd0VBQThFO0FBQzlFLGlFQUFzRTtBQUN0RSwyREFBMEQ7QUFFbEQsSUFBQSxRQUFRLEdBQWMsY0FBUSxTQUF0QixFQUFFLE9BQU8sR0FBSyxjQUFRLFFBQWIsQ0FBYztBQUV2QyxTQUF3QiwyQkFBMkIsQ0FDakQsZUFBa0QsRUFDbEQsTUFBYyxFQUNkLE1BQWM7SUFFZCxJQUFNLHVCQUF1QixHQUFHLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0lBQzNELElBQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsZUFBZSxFQUFFO1FBQy9DLHVCQUF1Qix5QkFBQTtRQUN2Qiw4QkFBOEIsRUFBRSxJQUFJO0tBQ3JDLENBQUMsQ0FBQztJQUVILElBQU0sZUFBZSxHQUFHLElBQUEsNkRBQXlDLEVBQy9ELGVBQWUsQ0FDaEI7UUFDQyxDQUFDLENBQUMsT0FBTyxDQUNMLElBQUEseUJBQU0sRUFBQyxJQUFBLHlCQUFNLEVBQUMsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUNsQyxJQUFBLHdDQUFzQixFQUFDLE1BQU0sQ0FBQyxFQUM5QixFQUFFLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxDQUNyQztRQUNILENBQUMsQ0FBQyxJQUFBLHlCQUFNLEVBQUMsSUFBQSx5QkFBTSxFQUFDLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN2QyxPQUFPLElBQUEseUJBQU0sRUFBQyxJQUFBLDZCQUFhLEVBQUMsWUFBWSxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsZUFBZSxDQUFDLENBQUMsQ0FBQztBQUMxRSxDQUFDO0FBckJELDhDQXFCQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-java",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "description": "Prettier Java Plugin",
   "main": "dist/index.js",
   "files": [
@@ -9,9 +9,9 @@
   "repository": "https://github.com/jhipster/prettier-java",
   "license": "Apache-2.0",
   "dependencies": {
-    "java-parser": "2.0.4",
+    "java-parser": "2.0.5",
     "lodash": "4.17.21",
-    "prettier": "2.8.4"
+    "prettier": "3.0.2"
   },
   "scripts": {
     "test": "yarn run test:unit && yarn run test:e2e-core",
@@ -37,10 +37,9 @@
     "@types/klaw-sync": "6.0.1",
     "@types/lodash": "4.14.190",
     "@types/node": "18.11.9",
-    "@types/prettier": "2.7.1",
     "@types/sinon": "10.0.13",
     "ts-node": "10.9.1",
     "typescript": "4.9.3"
   },
-  "gitHead": "28084f4c2c6b53784c5853fc51865dc8c7b083f9"
+  "gitHead": "fce16b970ecc46e1cc3f134432eac42877801674"
 }