npm - prettier-plugin-java - Versions diffs - 2.2.0 → 2.3.1 - Mend

prettier-plugin-java 2.2.0 → 2.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/README.md +1 -2
package/dist/printers/classes.js +5 -3
package/dist/printers/comments/handle-comments.js +62 -21
package/dist/printers/expressions.js +40 -62
package/dist/printers/lexical-structure.js +21 -1
package/dist/printers/printer-utils.js +121 -61
package/dist/printers/types-values-and-variables.js +10 -6
package/package.json +4 -4

package/README.md CHANGED Viewed

@@ -2,7 +2,7 @@
 # prettier-plugin-java
-![Prettier Banner](https://raw.githubusercontent.com/prettier/prettier-logo/master/images/prettier-banner-light.png)
+![Prettier Java Banner](https://raw.githubusercontent.com/jhipster/prettier-java/main/logo/prettier-java-banner-light.svg)
 Prettier is an opinionated code formatter which forces a certain coding style. It makes the code consistent through an entire project.
@@ -156,4 +156,3 @@ public void myfunction() {
     .big();
 }
 ```

package/dist/printers/classes.js CHANGED Viewed

@@ -228,12 +228,14 @@ var ClassesPrettierVisitor = /** @class */ (function (_super) {
             }
             if (ctx.variableInitializer[0].children.expression[0].children
                 .ternaryExpression !== undefined) {
-                var firstPrimary = ctx.variableInitializer[0].children.expression[0].children
+                var unaryExpressions = ctx.variableInitializer[0].children.expression[0].children
                     .ternaryExpression[0].children.binaryExpression[0].children
-                    .unaryExpression[0].children.primary[0];
+                    .unaryExpression;
+                var firstPrimary = unaryExpressions[0].children.primary[0];
                 // Cast Expression
                 if (firstPrimary.children.primaryPrefix[0].children.castExpression !==
-                    undefined) {
+                    undefined &&
+                    unaryExpressions.length === 1) {
                     var groupId = Symbol("assignment");
                     return (0, prettier_builder_1.group)([
                         (0, prettier_builder_1.group)(variableDeclaratorId),

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

@@ -3,36 +3,77 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleCommentsBinaryExpression = void 0;
 var comments_utils_1 = require("./comments-utils");
 function handleCommentsBinaryExpression(ctx) {
+    moveOperatorLeadingCommentsToNextExpression(ctx);
+    moveExpressionTrailingCommentsToNextOperator(ctx);
+}
+exports.handleCommentsBinaryExpression = handleCommentsBinaryExpression;
+function moveOperatorLeadingCommentsToNextExpression(ctx) {
+    var _a;
     var unaryExpressionIndex = 1;
-    if (ctx.BinaryOperator !== undefined) {
-        ctx.BinaryOperator.forEach(function (binaryOperator) {
+    (_a = ctx.BinaryOperator) === null || _a === void 0 ? void 0 : _a.forEach(function (binaryOperator) {
+        var _a;
+        if ((0, comments_utils_1.hasLeadingComments)(binaryOperator)) {
+            while (ctx.unaryExpression[unaryExpressionIndex].location.startOffset <
+                binaryOperator.endOffset) {
+                unaryExpressionIndex++;
+            }
+            // Adapt the position of the operator and its leading comments
+            var shiftUp = binaryOperator.leadingComments[0].startLine -
+                1 -
+                binaryOperator.startLine;
+            if (binaryOperator.startLine !==
+                ctx.unaryExpression[unaryExpressionIndex].location.startLine) {
+                binaryOperator.leadingComments.forEach(function (comment) {
+                    comment.startLine += 1;
+                    comment.endLine += 1;
+                });
+            }
+            binaryOperator.startLine += shiftUp;
+            binaryOperator.endLine += shiftUp;
+            // Move binaryOperator's leading comments to the following
+            // unaryExpression
+            ctx.unaryExpression[unaryExpressionIndex].leadingComments =
+                ctx.unaryExpression[unaryExpressionIndex].leadingComments || [];
+            (_a = ctx.unaryExpression[unaryExpressionIndex].leadingComments).unshift.apply(_a, binaryOperator.leadingComments);
+            delete binaryOperator.leadingComments;
+        }
+    });
+}
+function moveExpressionTrailingCommentsToNextOperator(ctx) {
+    var binaryOperators = ctx.BinaryOperator;
+    var binaryOperatorIndex = 1;
+    if (binaryOperators === null || binaryOperators === void 0 ? void 0 : binaryOperators.length) {
+        ctx.unaryExpression.forEach(function (unaryExpression) {
             var _a;
-            if ((0, comments_utils_1.hasLeadingComments)(binaryOperator)) {
-                while (ctx.unaryExpression[unaryExpressionIndex].location.startOffset <
-                    binaryOperator.endOffset) {
-                    unaryExpressionIndex++;
+            var _b;
+            if ((0, comments_utils_1.hasTrailingComments)(unaryExpression)) {
+                while (binaryOperatorIndex < binaryOperators.length &&
+                    unaryExpression.location.endOffset &&
+                    binaryOperators[binaryOperatorIndex].startOffset <
+                        unaryExpression.location.endOffset) {
+                    binaryOperatorIndex++;
                 }
-                // Adapt the position of the operator and its leading comments
-                var shiftUp = binaryOperator.leadingComments[0].startLine -
+                var binaryOperator = binaryOperators[binaryOperatorIndex];
+                // Adapt the position of the expression and its trailing comments
+                var shiftUp = unaryExpression.trailingComments[0].startLine -
                     1 -
-                    binaryOperator.startLine;
-                if (binaryOperator.startLine !==
-                    ctx.unaryExpression[unaryExpressionIndex].location.startLine) {
-                    binaryOperator.leadingComments.forEach(function (comment) {
+                    unaryExpression.location.startLine;
+                if (unaryExpression.location.startLine !== binaryOperator.startLine) {
+                    unaryExpression.trailingComments.forEach(function (comment) {
                         comment.startLine += 1;
                         comment.endLine += 1;
                     });
                 }
-                binaryOperator.startLine += shiftUp;
-                binaryOperator.endLine += shiftUp;
-                // Assign the leading comments & trailing comments of the binaryOperator
-                // to the following unaryExpression as leading comments
-                ctx.unaryExpression[unaryExpressionIndex].leadingComments =
-                    ctx.unaryExpression[unaryExpressionIndex].leadingComments || [];
-                (_a = ctx.unaryExpression[unaryExpressionIndex].leadingComments).unshift.apply(_a, binaryOperator.leadingComments);
-                delete binaryOperator.leadingComments;
+                unaryExpression.location.startLine += shiftUp;
+                if (unaryExpression.location.endLine !== undefined) {
+                    unaryExpression.location.endLine += shiftUp;
+                }
+                // Move unaryExpression's trailing comments to the following
+                // binaryOperator
+                binaryOperator.trailingComments = (_b = binaryOperator.trailingComments) !== null && _b !== void 0 ? _b : [];
+                (_a = binaryOperator.trailingComments).unshift.apply(_a, unaryExpression.trailingComments);
+                delete unaryExpression.trailingComments;
             }
         });
     }
 }
-exports.handleCommentsBinaryExpression = handleCommentsBinaryExpression;

package/dist/printers/expressions.js CHANGED Viewed

@@ -14,6 +14,17 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 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)) {
@@ -157,68 +168,36 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
     };
     ExpressionsPrettierVisitor.prototype.binaryExpression = function (ctx, params) {
         (0, handle_comments_1.handleCommentsBinaryExpression)(ctx);
-        var instanceofReferences = this.mapVisit((0, printer_utils_1.sortNodes)([ctx.pattern, ctx.referenceType]));
-        var expression = this.mapVisit(ctx.expression);
-        var unaryExpression = this.mapVisit(ctx.unaryExpression);
-        var _a = (0, printer_utils_1.separateTokensIntoGroups)(ctx), groupsOfOperator = _a.groupsOfOperator, sortedBinaryOperators = _a.sortedBinaryOperators;
-        var segmentsSplitByBinaryOperator = [];
-        var currentSegment = [];
-        if (groupsOfOperator.length === 1 && groupsOfOperator[0].length === 0) {
-            return unaryExpression.shift();
-        }
-        groupsOfOperator.forEach(function (subgroup) {
-            currentSegment = [unaryExpression.shift()];
-            for (var i = 0; i < subgroup.length; i++) {
-                var token = subgroup[i];
-                var shiftOperator = (0, printer_utils_1.isShiftOperator)(subgroup, i);
-                if (token.tokenType.name === "Instanceof") {
-                    currentSegment.push((0, printer_utils_1.rejectAndJoin)(" ", [
-                        ctx.Instanceof[0],
-                        instanceofReferences.shift()
-                    ]));
-                }
-                else if ((0, printer_utils_1.matchCategory)(token, "'AssignmentOperator'")) {
-                    currentSegment.push((0, prettier_builder_1.indent)((0, printer_utils_1.rejectAndJoin)(line, [token, expression.shift()])));
-                }
-                else if (shiftOperator === "leftShift" ||
-                    shiftOperator === "rightShift") {
-                    currentSegment.push((0, printer_utils_1.rejectAndJoin)(" ", [
-                        (0, printer_utils_1.rejectAndConcat)([token, subgroup[i + 1]]),
-                        unaryExpression.shift()
-                    ]));
-                    i++;
-                }
-                else if (shiftOperator === "doubleRightShift") {
-                    currentSegment.push((0, printer_utils_1.rejectAndJoin)(" ", [
-                        (0, printer_utils_1.rejectAndConcat)([token, subgroup[i + 1], subgroup[i + 2]]),
-                        unaryExpression.shift()
-                    ]));
-                    i += 2;
-                }
-                else if ((0, printer_utils_1.matchCategory)(token, "'BinaryOperator'")) {
-                    currentSegment.push((0, printer_utils_1.rejectAndJoin)(line, [token, unaryExpression.shift()]));
-                }
-            }
-            segmentsSplitByBinaryOperator.push((0, prettier_builder_1.group)((0, printer_utils_1.rejectAndJoin)(" ", currentSegment)));
-        });
-        if (params !== undefined && params.addParenthesisToWrapStatement) {
-            return (0, prettier_builder_1.group)((0, prettier_builder_1.concat)([
-                ifBreak("(", ""),
-                (0, prettier_builder_1.indent)((0, prettier_builder_1.concat)([
-                    softline,
-                    (0, prettier_builder_1.group)((0, printer_utils_1.rejectAndJoinSeps)(sortedBinaryOperators.map(function (elt) { return (0, prettier_builder_1.concat)([" ", elt, line]); }), segmentsSplitByBinaryOperator))
-                ])),
+        var sortedNodes = (0, printer_utils_1.sortNodes)([
+            ctx.pattern,
+            ctx.referenceType,
+            ctx.expression,
+            ctx.unaryExpression
+        ]);
+        var nodes = this.mapVisit(sortedNodes, sortedNodes.length === 1 ? params : undefined);
+        var tokens = (0, printer_utils_1.sortTokens)([
+            ctx.Instanceof,
+            ctx.AssignmentOperator,
+            ctx.Less,
+            ctx.Greater,
+            ctx.BinaryOperator
+        ]);
+        var hasTokens = tokens.length > 0;
+        var content = (0, printer_utils_1.binary)(nodes, tokens, true);
+        return hasTokens && (params === null || params === void 0 ? void 0 : params.addParenthesisToWrapStatement)
+            ? (0, prettier_builder_1.group)((0, prettier_builder_1.concat)([
+                ifBreak("("),
+                (0, prettier_builder_1.indent)((0, prettier_builder_1.concat)([softline, content])),
                 softline,
                 ifBreak(")")
-            ]));
-        }
-        return (0, prettier_builder_1.group)((0, printer_utils_1.rejectAndJoinSeps)(sortedBinaryOperators.map(function (elt) { return (0, prettier_builder_1.concat)([" ", elt, line]); }), segmentsSplitByBinaryOperator));
+            ]))
+            : content;
     };
-    ExpressionsPrettierVisitor.prototype.unaryExpression = function (ctx) {
+    ExpressionsPrettierVisitor.prototype.unaryExpression = function (ctx, params) {
         var unaryPrefixOperator = ctx.UnaryPrefixOperator
             ? ctx.UnaryPrefixOperator
             : [];
-        var primary = this.visit(ctx.primary);
+        var primary = this.visit(ctx.primary, params);
         var unarySuffixOperator = ctx.UnarySuffixOperator
             ? ctx.UnarySuffixOperator
             : [];
@@ -242,11 +221,9 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
             unarySuffixOperator
         ]);
     };
-    ExpressionsPrettierVisitor.prototype.primary = function (ctx) {
+    ExpressionsPrettierVisitor.prototype.primary = function (ctx, params) {
         var countMethodInvocation = (0, printer_utils_1.isUniqueMethodInvocation)(ctx.primarySuffix);
-        var primaryPrefix = this.visit(ctx.primaryPrefix, {
-            shouldBreakBeforeFirstMethodInvocation: countMethodInvocation > 1
-        });
+        var primaryPrefix = this.visit(ctx.primaryPrefix, __assign(__assign({}, params), { shouldBreakBeforeFirstMethodInvocation: countMethodInvocation > 1 }));
         var suffixes = [];
         if (ctx.primarySuffix !== undefined) {
             // edge case: https://github.com/jhipster/prettier-java/issues/381
@@ -386,9 +363,10 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
         var typeArguments = this.visit(ctx.typeArguments);
         return (0, printer_utils_1.rejectAndConcat)([keyWord, typeArguments]);
     };
-    ExpressionsPrettierVisitor.prototype.parenthesisExpression = function (ctx) {
+    ExpressionsPrettierVisitor.prototype.parenthesisExpression = function (ctx, params) {
         var expression = this.visit(ctx.expression);
-        return (0, printer_utils_1.putIntoBraces)(expression, softline, ctx.LBrace[0], ctx.RBrace[0]);
+        var separator = (params === null || params === void 0 ? void 0 : params.addParenthesisToWrapStatement) ? softline : "";
+        return (0, printer_utils_1.putIntoBraces)(expression, separator, ctx.LBrace[0], ctx.RBrace[0]);
     };
     ExpressionsPrettierVisitor.prototype.castExpression = function (ctx) {
         return this.visitSingle(ctx);

package/dist/printers/lexical-structure.js CHANGED Viewed

@@ -14,17 +14,37 @@ var __extends = (this && this.__extends) || (function () {
         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));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LexicalStructurePrettierVisitor = void 0;
 var format_comments_1 = require("./comments/format-comments");
+var prettier_builder_1 = require("./prettier-builder");
 var base_cst_printer_1 = require("../base-cst-printer");
+var doc_1 = require("prettier/doc");
+var hardline = doc_1.builders.hardline;
 var LexicalStructurePrettierVisitor = /** @class */ (function (_super) {
     __extends(LexicalStructurePrettierVisitor, _super);
     function LexicalStructurePrettierVisitor() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     LexicalStructurePrettierVisitor.prototype.literal = function (ctx) {
-        if (ctx.CharLiteral || ctx.TextBlock || ctx.StringLiteral || ctx.Null) {
+        if (ctx.TextBlock) {
+            var lines = ctx.TextBlock[0].image.split("\n");
+            var open_1 = lines.shift();
+            var baseIndent_1 = Math.min.apply(Math, lines.map(function (line) { return line.search(/\S/); }).filter(function (indent) { return indent >= 0; }));
+            return (0, prettier_builder_1.join)(hardline, __spreadArray([
+                open_1
+            ], lines.map(function (line) { return line.slice(baseIndent_1); }), true));
+        }
+        if (ctx.CharLiteral || ctx.StringLiteral || ctx.Null) {
             return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
         }
         return this.visitSingle(ctx);

package/dist/printers/printer-utils.js CHANGED Viewed

@@ -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);
 }
@@ -443,62 +447,118 @@ 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_1 = (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_1, ")"])
+                    : content_1);
+                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_2 = indent(binary(nodes, tokens));
+            nodes.unshift(levelOperator !== undefined &&
+                needsParentheses(nextOperator, levelOperator)
+                ? (0, prettier_builder_1.concat)(["(", content_2, ")"])
+                : content_2);
         }
-    });
-    groupsOfOperator.push(tmpGroup);
-    return {
-        groupsOfOperator: groupsOfOperator,
-        sortedBinaryOperators: sortedBinaryOperators
-    };
+    }
+    level.push(nodes.shift());
+    var content = (0, prettier_builder_1.group)((0, prettier_builder_1.join)(line, level));
+    return levelOperator === "=" ? indent(content) : content;
 }
-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] === ";"));
 }

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

@@ -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) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-java",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "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": "3.0.0"
+    "prettier": "3.0.3"
   },
   "scripts": {
     "test": "yarn run test:unit && yarn run test:e2e-core",
@@ -41,5 +41,5 @@
     "ts-node": "10.9.1",
     "typescript": "4.9.3"
   },
-  "gitHead": "f93d55a4b4764c8ff289602f91716e686f112b50"
+  "gitHead": "a7f9a5f795a87ccfd7910118b0856b449dedb957"
 }