prettier-plugin-java 1.6.2 → 2.1.0

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

@@ -1,14 +1,22 @@
 "use strict";
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+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.processComments = exports.getTokenLeadingComments = exports.printNodeWithComments = exports.printTokenWithComments = void 0;
 var doc_1 = require("prettier/doc");
 var utils_1 = require("../../types/utils");
-var concat = doc_1.builders.concat, hardline = doc_1.builders.hardline, lineSuffix = doc_1.builders.lineSuffix, breakParent = doc_1.builders.breakParent, literalline = doc_1.builders.literalline;
+var isEmptyDoc_1 = __importDefault(require("../../utils/isEmptyDoc"));
+var hardline = doc_1.builders.hardline, lineSuffix = doc_1.builders.lineSuffix, breakParent = doc_1.builders.breakParent, literalline = doc_1.builders.literalline;
 /**
  * Takes a token and return a doc with:
  * - concatenated leading comments
@@ -41,7 +49,7 @@ function printWithComments(nodeOrToken, value, getLeadingComments, getTrailingCo
     var trailingComments = getTrailingComments(nodeOrToken, value);
     return leadingComments.length === 0 && trailingComments.length === 0
         ? value
-        : concat(__spreadArray(__spreadArray(__spreadArray([], leadingComments), [value]), trailingComments));
+        : __spreadArray(__spreadArray(__spreadArray([], leadingComments, true), [value], false), trailingComments, true);
 }
 /**
  * @param {IToken} token
@@ -63,7 +71,7 @@ function getLeadingComments(nodeOrToken, location) {
     if (nodeOrToken.leadingComments !== undefined) {
         var previousEndLine = nodeOrToken.leadingComments[0].endLine;
         var step = void 0;
-        arr.push(concat(formatComment(nodeOrToken.leadingComments[0])));
+        arr.push(formatComment(nodeOrToken.leadingComments[0]));
         for (var i = 1; i < nodeOrToken.leadingComments.length; i++) {
             step = nodeOrToken.leadingComments[i].startLine - previousEndLine;
             if (step === 1 ||
@@ -73,7 +81,7 @@ function getLeadingComments(nodeOrToken, location) {
             else if (step > 1) {
                 arr.push(hardline, hardline);
             }
-            arr.push(concat(formatComment(nodeOrToken.leadingComments[i])));
+            arr.push(formatComment(nodeOrToken.leadingComments[i]));
             previousEndLine = nodeOrToken.leadingComments[i].endLine;
         }
         step = location.startLine - previousEndLine;
@@ -112,14 +120,14 @@ function getTrailingComments(nodeOrToken, value, location) {
             if (comment.startLine !== previousEndLine) {
                 arr.push(hardline);
             }
-            else if (value !== "" && idx === 0) {
+            else if (!(0, isEmptyDoc_1.default)(value) && idx === 0) {
                 separator = " ";
             }
             if (comment.tokenType.name === "LineComment") {
-                arr.push(lineSuffix(concat([separator, concat(formatComment(comment)), breakParent])));
+                arr.push(lineSuffix([separator, formatComment(comment), breakParent]));
             }
             else {
-                arr.push(concat(formatComment(comment)));
+                arr.push(formatComment(comment));
             }
             previousEndLine = comment.endLine;
         });
@@ -164,13 +172,13 @@ function formatComment(comment) {
 }
 function processComments(docs) {
     if (!Array.isArray(docs)) {
-        if (utils_1.isCstElementOrUndefinedIToken(docs)) {
+        if ((0, utils_1.isCstElementOrUndefinedIToken)(docs)) {
             return printTokenWithComments(docs);
         }
         return docs;
     }
     return docs.map(function (elt) {
-        if (utils_1.isCstElementOrUndefinedIToken(elt)) {
+        if ((0, utils_1.isCstElementOrUndefinedIToken)(elt)) {
             return printTokenWithComments(elt);
         }
         return elt;

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

@@ -7,7 +7,7 @@ function handleCommentsBinaryExpression(ctx) {
     if (ctx.BinaryOperator !== undefined) {
         ctx.BinaryOperator.forEach(function (binaryOperator) {
             var _a;
-            if (comments_utils_1.hasLeadingComments(binaryOperator)) {
+            if ((0, comments_utils_1.hasLeadingComments)(binaryOperator)) {
                 while (ctx.unaryExpression[unaryExpressionIndex].location.startOffset <
                     binaryOperator.endOffset) {
                     unaryExpressionIndex++;

package/dist/printers/expressions.js

@@ -14,10 +14,14 @@ 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) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+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 };
@@ -44,11 +48,11 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
         return this.visitSingle(ctx, params);
     };
     ExpressionsPrettierVisitor.prototype.lambdaExpression = function (ctx, params) {
-        var lambdaParameters = prettier_builder_1.group(this.visit(ctx.lambdaParameters, params), params ? { id: params.lambdaParametersGroupId } : undefined);
+        var lambdaParameters = (0, prettier_builder_1.group)(this.visit(ctx.lambdaParameters, params), params ? { id: params.lambdaParametersGroupId } : undefined);
         var lambdaBody = this.visit(ctx.lambdaBody);
         var isLambdaBodyABlock = ctx.lambdaBody[0].children.block !== undefined;
         if (isLambdaBodyABlock) {
-            return printer_utils_1.rejectAndJoin(" ", [
+            return (0, printer_utils_1.rejectAndJoin)(" ", [
                 lambdaParameters,
                 ctx.Arrow[0],
                 (params === null || params === void 0 ? void 0 : params.lambdaParametersGroupId) !== undefined
@@ -58,8 +62,8 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
                     : lambdaBody
             ]);
         }
-        return prettier_builder_1.group(prettier_builder_1.indent(printer_utils_1.rejectAndJoin(line, [
-            printer_utils_1.rejectAndJoin(" ", [lambdaParameters, ctx.Arrow[0]]),
+        return (0, prettier_builder_1.group)((0, prettier_builder_1.indent)((0, printer_utils_1.rejectAndJoin)(line, [
+            (0, printer_utils_1.rejectAndJoin)(" ", [lambdaParameters, ctx.Arrow[0]]),
             lambdaBody
         ])));
     };
@@ -67,26 +71,26 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
         if (ctx.lambdaParametersWithBraces) {
             return this.visitSingle(ctx, params);
         }
-        return format_comments_1.printTokenWithComments(this.getSingle(ctx));
+        return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
     };
     ExpressionsPrettierVisitor.prototype.lambdaParametersWithBraces = function (ctx, params) {
         var lambdaParameterList = this.visit(ctx.lambdaParameterList);
-        if (printer_utils_1.findDeepElementInPartsArray(lambdaParameterList, ",")) {
-            var content = printer_utils_1.putIntoBraces(lambdaParameterList, softline, ctx.LBrace[0], ctx.RBrace[0]);
+        if ((0, printer_utils_1.findDeepElementInPartsArray)(lambdaParameterList, ",")) {
+            var content = (0, printer_utils_1.putIntoBraces)(lambdaParameterList, softline, ctx.LBrace[0], ctx.RBrace[0]);
             if ((params === null || params === void 0 ? void 0 : params.isInsideMethodInvocationSuffix) === true) {
-                return prettier_builder_1.indent(prettier_builder_1.concat([softline, content]));
+                return (0, prettier_builder_1.indent)((0, prettier_builder_1.concat)([softline, content]));
             }
             return content;
         }
         // removing braces when only no comments attached
         if ((ctx.LBrace &&
             ctx.RBrace &&
-            (!lambdaParameterList || printer_utils_1.isExplicitLambdaParameter(ctx))) ||
+            (!lambdaParameterList || (0, printer_utils_1.isExplicitLambdaParameter)(ctx))) ||
             ctx.LBrace[0].leadingComments ||
             ctx.LBrace[0].trailingComments ||
             ctx.RBrace[0].leadingComments ||
             ctx.RBrace[0].trailingComments) {
-            return printer_utils_1.rejectAndConcat([
+            return (0, printer_utils_1.rejectAndConcat)([
                 ctx.LBrace[0],
                 lambdaParameterList,
                 ctx.RBrace[0]
@@ -100,19 +104,19 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
     ExpressionsPrettierVisitor.prototype.inferredLambdaParameterList = function (ctx) {
         var commas = ctx.Comma
             ? ctx.Comma.map(function (elt) {
-                return prettier_builder_1.concat([elt, line]);
+                return (0, prettier_builder_1.concat)([elt, line]);
             })
             : [];
-        return printer_utils_1.rejectAndJoinSeps(commas, ctx.Identifier);
+        return (0, printer_utils_1.rejectAndJoinSeps)(commas, ctx.Identifier);
     };
     ExpressionsPrettierVisitor.prototype.explicitLambdaParameterList = function (ctx) {
         var lambdaParameter = this.mapVisit(ctx.lambdaParameter);
         var commas = ctx.Comma
             ? ctx.Comma.map(function (elt) {
-                return prettier_builder_1.concat([elt, line]);
+                return (0, prettier_builder_1.concat)([elt, line]);
             })
             : [];
-        return printer_utils_1.rejectAndJoinSeps(commas, lambdaParameter);
+        return (0, printer_utils_1.rejectAndJoinSeps)(commas, lambdaParameter);
     };
     ExpressionsPrettierVisitor.prototype.lambdaParameter = function (ctx) {
         return this.visitSingle(ctx);
@@ -121,8 +125,8 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
         var variableModifier = this.mapVisit(ctx.variableModifier);
         var lambdaParameterType = this.visit(ctx.lambdaParameterType);
         var variableDeclaratorId = this.visit(ctx.variableDeclaratorId);
-        return printer_utils_1.rejectAndJoin(" ", [
-            printer_utils_1.rejectAndJoin(" ", variableModifier),
+        return (0, printer_utils_1.rejectAndJoin)(" ", [
+            (0, printer_utils_1.rejectAndJoin)(" ", variableModifier),
             lambdaParameterType,
             variableDeclaratorId
         ]);
@@ -131,7 +135,7 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
         if (ctx.unannType) {
             return this.visitSingle(ctx);
         }
-        return format_comments_1.printTokenWithComments(this.getSingle(ctx));
+        return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
     };
     ExpressionsPrettierVisitor.prototype.lambdaBody = function (ctx) {
         return this.visitSingle(ctx);
@@ -141,22 +145,22 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
         if (ctx.QuestionMark) {
             var expression1 = this.visit(ctx.expression[0]);
             var expression2 = this.visit(ctx.expression[1]);
-            return prettier_builder_1.indent(prettier_builder_1.group(printer_utils_1.rejectAndConcat([
-                printer_utils_1.rejectAndJoin(line, [
+            return (0, prettier_builder_1.indent)((0, prettier_builder_1.group)((0, printer_utils_1.rejectAndConcat)([
+                (0, printer_utils_1.rejectAndJoin)(line, [
                     binaryExpression,
-                    printer_utils_1.rejectAndJoin(" ", [ctx.QuestionMark[0], expression1]),
-                    printer_utils_1.rejectAndJoin(" ", [ctx.Colon[0], expression2])
+                    (0, printer_utils_1.rejectAndJoin)(" ", [ctx.QuestionMark[0], expression1]),
+                    (0, printer_utils_1.rejectAndJoin)(" ", [ctx.Colon[0], expression2])
                 ])
             ])));
         }
         return binaryExpression;
     };
     ExpressionsPrettierVisitor.prototype.binaryExpression = function (ctx, params) {
-        handle_comments_1.handleCommentsBinaryExpression(ctx);
-        var instanceofReferences = this.mapVisit(printer_utils_1.sortNodes([ctx.pattern, ctx.referenceType]));
+        (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 = printer_utils_1.separateTokensIntoGroups(ctx), groupsOfOperator = _a.groupsOfOperator, sortedBinaryOperators = _a.sortedBinaryOperators;
+        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) {
@@ -166,49 +170,49 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
             currentSegment = [unaryExpression.shift()];
             for (var i = 0; i < subgroup.length; i++) {
                 var token = subgroup[i];
-                var shiftOperator = printer_utils_1.isShiftOperator(subgroup, i);
+                var shiftOperator = (0, printer_utils_1.isShiftOperator)(subgroup, i);
                 if (token.tokenType.name === "Instanceof") {
-                    currentSegment.push(printer_utils_1.rejectAndJoin(" ", [
+                    currentSegment.push((0, printer_utils_1.rejectAndJoin)(" ", [
                         ctx.Instanceof[0],
                         instanceofReferences.shift()
                     ]));
                 }
-                else if (printer_utils_1.matchCategory(token, "'AssignmentOperator'")) {
-                    currentSegment.push(prettier_builder_1.indent(printer_utils_1.rejectAndJoin(line, [token, expression.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(printer_utils_1.rejectAndJoin(" ", [
-                        printer_utils_1.rejectAndConcat([token, subgroup[i + 1]]),
+                    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(printer_utils_1.rejectAndJoin(" ", [
-                        printer_utils_1.rejectAndConcat([token, subgroup[i + 1], subgroup[i + 2]]),
+                    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 (printer_utils_1.matchCategory(token, "'BinaryOperator'")) {
-                    currentSegment.push(printer_utils_1.rejectAndJoin(line, [token, unaryExpression.shift()]));
+                else if ((0, printer_utils_1.matchCategory)(token, "'BinaryOperator'")) {
+                    currentSegment.push((0, printer_utils_1.rejectAndJoin)(line, [token, unaryExpression.shift()]));
                 }
             }
-            segmentsSplitByBinaryOperator.push(prettier_builder_1.group(printer_utils_1.rejectAndJoin(" ", currentSegment)));
+            segmentsSplitByBinaryOperator.push((0, prettier_builder_1.group)((0, printer_utils_1.rejectAndJoin)(" ", currentSegment)));
         });
         if (params !== undefined && params.addParenthesisToWrapStatement) {
-            return prettier_builder_1.group(prettier_builder_1.concat([
+            return (0, prettier_builder_1.group)((0, prettier_builder_1.concat)([
                 ifBreak("(", ""),
-                prettier_builder_1.indent(prettier_builder_1.concat([
+                (0, prettier_builder_1.indent)((0, prettier_builder_1.concat)([
                     softline,
-                    prettier_builder_1.group(printer_utils_1.rejectAndJoinSeps(sortedBinaryOperators.map(function (elt) { return prettier_builder_1.concat([" ", elt, line]); }), segmentsSplitByBinaryOperator))
+                    (0, prettier_builder_1.group)((0, printer_utils_1.rejectAndJoinSeps)(sortedBinaryOperators.map(function (elt) { return (0, prettier_builder_1.concat)([" ", elt, line]); }), segmentsSplitByBinaryOperator))
                 ])),
                 softline,
                 ifBreak(")")
             ]));
         }
-        return prettier_builder_1.group(printer_utils_1.rejectAndJoinSeps(sortedBinaryOperators.map(function (elt) { return prettier_builder_1.concat([" ", elt, line]); }), segmentsSplitByBinaryOperator));
+        return (0, prettier_builder_1.group)((0, printer_utils_1.rejectAndJoinSeps)(sortedBinaryOperators.map(function (elt) { return (0, prettier_builder_1.concat)([" ", elt, line]); }), segmentsSplitByBinaryOperator));
     };
     ExpressionsPrettierVisitor.prototype.unaryExpression = function (ctx) {
         var unaryPrefixOperator = ctx.UnaryPrefixOperator
@@ -218,28 +222,28 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
         var unarySuffixOperator = ctx.UnarySuffixOperator
             ? ctx.UnarySuffixOperator
             : [];
-        return printer_utils_1.rejectAndConcat([
-            printer_utils_1.rejectAndConcat(unaryPrefixOperator),
+        return (0, printer_utils_1.rejectAndConcat)([
+            (0, printer_utils_1.rejectAndConcat)(unaryPrefixOperator),
             primary,
-            printer_utils_1.rejectAndConcat(unarySuffixOperator)
+            (0, printer_utils_1.rejectAndConcat)(unarySuffixOperator)
         ]);
     };
     ExpressionsPrettierVisitor.prototype.unaryExpressionNotPlusMinus = function (ctx) {
         var unaryPrefixOperatorNotPlusMinus = ctx.UnaryPrefixOperatorNotPlusMinus // changed when moved to TS
-            ? printer_utils_1.rejectAndJoin(" ", ctx.UnaryPrefixOperatorNotPlusMinus) // changed when moved to TS
+            ? (0, printer_utils_1.rejectAndJoin)(" ", ctx.UnaryPrefixOperatorNotPlusMinus) // changed when moved to TS
             : "";
         var primary = this.visit(ctx.primary);
         var unarySuffixOperator = ctx.UnarySuffixOperator // changed when moved to TS
-            ? printer_utils_1.rejectAndJoin(" ", ctx.UnarySuffixOperator) // changed when moved to TS
+            ? (0, printer_utils_1.rejectAndJoin)(" ", ctx.UnarySuffixOperator) // changed when moved to TS
             : "";
-        return printer_utils_1.rejectAndJoin(" ", [
+        return (0, printer_utils_1.rejectAndJoin)(" ", [
             unaryPrefixOperatorNotPlusMinus,
             primary,
             unarySuffixOperator
         ]);
     };
     ExpressionsPrettierVisitor.prototype.primary = function (ctx) {
-        var countMethodInvocation = printer_utils_1.isUniqueMethodInvocation(ctx.primarySuffix);
+        var countMethodInvocation = (0, printer_utils_1.isUniqueMethodInvocation)(ctx.primarySuffix);
         var primaryPrefix = this.visit(ctx.primaryPrefix, {
             shouldBreakBeforeFirstMethodInvocation: countMethodInvocation > 1
         });
@@ -284,32 +288,32 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
             }
             if (countMethodInvocation === 1 &&
                 ctx.primaryPrefix[0].children.newExpression === undefined) {
-                return prettier_builder_1.group(printer_utils_1.rejectAndConcat([
+                return (0, prettier_builder_1.group)((0, printer_utils_1.rejectAndConcat)([
                     primaryPrefix,
-                    hasFirstInvocationArg ? suffixes[0] : prettier_builder_1.indent(suffixes[0]),
-                    prettier_builder_1.indent(printer_utils_1.rejectAndConcat(suffixes.slice(1)))
+                    hasFirstInvocationArg ? suffixes[0] : (0, prettier_builder_1.indent)(suffixes[0]),
+                    (0, prettier_builder_1.indent)((0, printer_utils_1.rejectAndConcat)(suffixes.slice(1)))
                 ]));
             }
         }
-        return prettier_builder_1.group(printer_utils_1.rejectAndConcat([primaryPrefix, prettier_builder_1.indent(printer_utils_1.rejectAndConcat(suffixes))]));
+        return (0, prettier_builder_1.group)((0, printer_utils_1.rejectAndConcat)([primaryPrefix, (0, prettier_builder_1.indent)((0, printer_utils_1.rejectAndConcat)(suffixes))]));
     };
     ExpressionsPrettierVisitor.prototype.primaryPrefix = function (ctx, params) {
         if (ctx.This || ctx.Void) {
-            return format_comments_1.printTokenWithComments(this.getSingle(ctx));
+            return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
         }
         return this.visitSingle(ctx, params);
     };
     ExpressionsPrettierVisitor.prototype.primarySuffix = function (ctx, params) {
         if (ctx.Dot) {
             if (ctx.This) {
-                return printer_utils_1.rejectAndConcat([ctx.Dot[0], ctx.This[0]]);
+                return (0, printer_utils_1.rejectAndConcat)([ctx.Dot[0], ctx.This[0]]);
             }
             else if (ctx.Identifier) {
                 var typeArguments = this.visit(ctx.typeArguments);
-                return printer_utils_1.rejectAndConcat([ctx.Dot[0], typeArguments, ctx.Identifier[0]]);
+                return (0, printer_utils_1.rejectAndConcat)([ctx.Dot[0], typeArguments, ctx.Identifier[0]]);
             }
             var unqualifiedClassInstanceCreationExpression = this.visit(ctx.unqualifiedClassInstanceCreationExpression);
-            return printer_utils_1.rejectAndConcat([
+            return (0, printer_utils_1.rejectAndConcat)([
                 ctx.Dot[0],
                 unqualifiedClassInstanceCreationExpression
             ]);
@@ -326,22 +330,22 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
             params.shouldBreakBeforeFirstMethodInvocation === true) {
             // when fqnOrRefType is a method call from an object
             if (isMethodInvocation) {
-                return printer_utils_1.rejectAndConcat([
-                    prettier_builder_1.indent(printer_utils_1.rejectAndJoin(prettier_builder_1.concat([softline, dots[0]]), [
+                return (0, printer_utils_1.rejectAndConcat)([
+                    (0, prettier_builder_1.indent)((0, printer_utils_1.rejectAndJoin)((0, prettier_builder_1.concat)([softline, dots[0]]), [
                         fqnOrRefTypePartFirst,
-                        printer_utils_1.rejectAndJoinSeps(dots.slice(1), fqnOrRefTypePartRest),
+                        (0, printer_utils_1.rejectAndJoinSeps)(dots.slice(1), fqnOrRefTypePartRest),
                         dims
                     ]))
                 ]);
                 // otherwise it is a fully qualified name but we need to exclude when it is just a method call
             }
             else if (ctx.Dot) {
-                return prettier_builder_1.indent(printer_utils_1.rejectAndConcat([
-                    printer_utils_1.rejectAndJoinSeps(dots.slice(0, dots.length - 1), __spreadArray([
+                return (0, prettier_builder_1.indent)((0, printer_utils_1.rejectAndConcat)([
+                    (0, printer_utils_1.rejectAndJoinSeps)(dots.slice(0, dots.length - 1), __spreadArray([
                         fqnOrRefTypePartFirst
-                    ], fqnOrRefTypePartRest.slice(0, fqnOrRefTypePartRest.length - 1))),
+                    ], fqnOrRefTypePartRest.slice(0, fqnOrRefTypePartRest.length - 1), true)),
                     softline,
-                    printer_utils_1.rejectAndConcat([
+                    (0, printer_utils_1.rejectAndConcat)([
                         dots[dots.length - 1],
                         fqnOrRefTypePartRest[fqnOrRefTypePartRest.length - 1]
                     ]),
@@ -349,16 +353,16 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
                 ]));
             }
         }
-        return printer_utils_1.rejectAndConcat([
-            printer_utils_1.rejectAndJoinSeps(dots, __spreadArray([fqnOrRefTypePartFirst], fqnOrRefTypePartRest)),
+        return (0, printer_utils_1.rejectAndConcat)([
+            (0, printer_utils_1.rejectAndJoinSeps)(dots, __spreadArray([fqnOrRefTypePartFirst], fqnOrRefTypePartRest, true)),
             dims
         ]);
     };
     ExpressionsPrettierVisitor.prototype.fqnOrRefTypePartFirst = function (ctx) {
         var annotation = this.mapVisit(ctx.annotation);
         var fqnOrRefTypeCommon = this.visit(ctx.fqnOrRefTypePartCommon);
-        return printer_utils_1.rejectAndJoin(" ", [
-            printer_utils_1.rejectAndJoin(" ", annotation),
+        return (0, printer_utils_1.rejectAndJoin)(" ", [
+            (0, printer_utils_1.rejectAndJoin)(" ", annotation),
             fqnOrRefTypeCommon
         ]);
     };
@@ -366,9 +370,9 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
         var annotation = this.mapVisit(ctx.annotation);
         var fqnOrRefTypeCommon = this.visit(ctx.fqnOrRefTypePartCommon);
         var typeArguments = this.visit(ctx.typeArguments);
-        return printer_utils_1.rejectAndJoin(" ", [
-            printer_utils_1.rejectAndJoin(" ", annotation),
-            printer_utils_1.rejectAndConcat([typeArguments, fqnOrRefTypeCommon])
+        return (0, printer_utils_1.rejectAndJoin)(" ", [
+            (0, printer_utils_1.rejectAndJoin)(" ", annotation),
+            (0, printer_utils_1.rejectAndConcat)([typeArguments, fqnOrRefTypeCommon])
         ]);
     };
     ExpressionsPrettierVisitor.prototype.fqnOrRefTypePartCommon = function (ctx) {
@@ -380,11 +384,11 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
             keyWord = ctx.Super[0];
         }
         var typeArguments = this.visit(ctx.typeArguments);
-        return printer_utils_1.rejectAndConcat([keyWord, typeArguments]);
+        return (0, printer_utils_1.rejectAndConcat)([keyWord, typeArguments]);
     };
     ExpressionsPrettierVisitor.prototype.parenthesisExpression = function (ctx) {
         var expression = this.visit(ctx.expression);
-        return printer_utils_1.putIntoBraces(expression, softline, ctx.LBrace[0], ctx.RBrace[0]);
+        return (0, printer_utils_1.putIntoBraces)(expression, softline, ctx.LBrace[0], ctx.RBrace[0]);
     };
     ExpressionsPrettierVisitor.prototype.castExpression = function (ctx) {
         return this.visitSingle(ctx);
@@ -392,20 +396,20 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
     ExpressionsPrettierVisitor.prototype.primitiveCastExpression = function (ctx) {
         var primitiveType = this.visit(ctx.primitiveType);
         var unaryExpression = this.visit(ctx.unaryExpression);
-        return printer_utils_1.rejectAndJoin(" ", [
-            printer_utils_1.rejectAndConcat([ctx.LBrace[0], primitiveType, ctx.RBrace[0]]),
+        return (0, printer_utils_1.rejectAndJoin)(" ", [
+            (0, printer_utils_1.rejectAndConcat)([ctx.LBrace[0], primitiveType, ctx.RBrace[0]]),
             unaryExpression
         ]);
     };
     ExpressionsPrettierVisitor.prototype.referenceTypeCastExpression = function (ctx) {
         var referenceType = this.visit(ctx.referenceType);
         var hasAdditionalBounds = ctx.additionalBound !== undefined;
-        var additionalBounds = printer_utils_1.rejectAndJoin(line, this.mapVisit(ctx.additionalBound));
+        var additionalBounds = (0, printer_utils_1.rejectAndJoin)(line, this.mapVisit(ctx.additionalBound));
         var expression = ctx.lambdaExpression
             ? this.visit(ctx.lambdaExpression)
             : this.visit(ctx.unaryExpressionNotPlusMinus);
-        return printer_utils_1.rejectAndJoin(" ", [
-            printer_utils_1.putIntoBraces(printer_utils_1.rejectAndJoin(line, [referenceType, additionalBounds]), hasAdditionalBounds ? softline : "", ctx.LBrace[0], ctx.RBrace[0]),
+        return (0, printer_utils_1.rejectAndJoin)(" ", [
+            (0, printer_utils_1.putIntoBraces)((0, printer_utils_1.rejectAndJoin)(line, [referenceType, additionalBounds]), hasAdditionalBounds ? softline : "", ctx.LBrace[0], ctx.RBrace[0]),
             expression
         ]);
     };
@@ -417,9 +421,9 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
         var classOrInterfaceTypeToInstantiate = this.visit(ctx.classOrInterfaceTypeToInstantiate);
         var content = utils_2.printArgumentListWithBraces.call(this, ctx.argumentList, ctx.RBrace[0], ctx.LBrace[0]);
         var classBody = this.visit(ctx.classBody);
-        return printer_utils_1.rejectAndJoin(" ", [
+        return (0, printer_utils_1.rejectAndJoin)(" ", [
             ctx.New[0],
-            printer_utils_1.rejectAndConcat([
+            (0, printer_utils_1.rejectAndConcat)([
                 typeArguments,
                 classOrInterfaceTypeToInstantiate,
                 content
@@ -429,23 +433,23 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
     };
     ExpressionsPrettierVisitor.prototype.classOrInterfaceTypeToInstantiate = function (ctx) {
         var _this = this;
-        var tokens = printer_utils_1.sortAnnotationIdentifier(ctx.annotation, ctx.Identifier);
+        var tokens = (0, printer_utils_1.sortAnnotationIdentifier)(ctx.annotation, ctx.Identifier);
         var segments = [];
         var currentSegment = [];
-        forEach_1.default(tokens, function (token) {
-            if (utils_1.isAnnotationCstNode(token)) {
+        (0, forEach_1.default)(tokens, function (token) {
+            if ((0, utils_1.isAnnotationCstNode)(token)) {
                 currentSegment.push(_this.visit([token]));
             }
             else {
                 currentSegment.push(token);
-                segments.push(printer_utils_1.rejectAndJoin(" ", currentSegment));
+                segments.push((0, printer_utils_1.rejectAndJoin)(" ", currentSegment));
                 currentSegment = [];
             }
         });
         var typeArgumentsOrDiamond = this.visit(ctx.typeArgumentsOrDiamond);
         var dots = ctx.Dot ? ctx.Dot : [];
-        return printer_utils_1.rejectAndConcat([
-            printer_utils_1.rejectAndJoinSeps(dots, segments),
+        return (0, printer_utils_1.rejectAndConcat)([
+            (0, printer_utils_1.rejectAndJoinSeps)(dots, segments),
             typeArgumentsOrDiamond
         ]);
     };
@@ -453,23 +457,23 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
         return this.visitSingle(ctx);
     };
     ExpressionsPrettierVisitor.prototype.diamond = function (ctx) {
-        return prettier_builder_1.concat([ctx.Less[0], ctx.Greater[0]]);
+        return (0, prettier_builder_1.concat)([ctx.Less[0], ctx.Greater[0]]);
     };
     ExpressionsPrettierVisitor.prototype.methodInvocationSuffix = function (ctx, params) {
-        var isSingleLambda = expressions_utils_1.isArgumentListSingleLambda(ctx.argumentList);
+        var isSingleLambda = (0, expressions_utils_1.isArgumentListSingleLambda)(ctx.argumentList);
         if (isSingleLambda) {
             return utils_2.printSingleLambdaInvocation.call(this, ctx.argumentList, ctx.RBrace[0], ctx.LBrace[0]);
         }
         var argumentList = this.visit(ctx.argumentList);
         if (params && params.shouldDedent) {
-            return prettier_builder_1.dedent(printer_utils_1.putIntoBraces(argumentList, softline, ctx.LBrace[0], ctx.RBrace[0]));
+            return (0, prettier_builder_1.dedent)((0, printer_utils_1.putIntoBraces)(argumentList, softline, ctx.LBrace[0], ctx.RBrace[0]));
         }
-        return printer_utils_1.putIntoBraces(argumentList, softline, ctx.LBrace[0], ctx.RBrace[0]);
+        return (0, printer_utils_1.putIntoBraces)(argumentList, softline, ctx.LBrace[0], ctx.RBrace[0]);
     };
     ExpressionsPrettierVisitor.prototype.argumentList = function (ctx, params) {
         var expressions = this.mapVisit(ctx.expression, params);
-        var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return prettier_builder_1.concat([elt, line]); }) : [];
-        return printer_utils_1.rejectAndJoinSeps(commas, expressions);
+        var commas = ctx.Comma ? ctx.Comma.map(function (elt) { return (0, prettier_builder_1.concat)([elt, line]); }) : [];
+        return (0, printer_utils_1.rejectAndJoinSeps)(commas, expressions);
     };
     ExpressionsPrettierVisitor.prototype.arrayCreationExpression = function (ctx) {
         var type = ctx.primitiveType
@@ -478,50 +482,68 @@ var ExpressionsPrettierVisitor = /** @class */ (function (_super) {
         var suffix = ctx.arrayCreationDefaultInitSuffix
             ? this.visit(ctx.arrayCreationDefaultInitSuffix)
             : this.visit(ctx.arrayCreationExplicitInitSuffix);
-        return printer_utils_1.rejectAndConcat([prettier_builder_1.concat([ctx.New[0], " "]), type, suffix]);
+        return (0, printer_utils_1.rejectAndConcat)([(0, prettier_builder_1.concat)([ctx.New[0], " "]), type, suffix]);
     };
     ExpressionsPrettierVisitor.prototype.arrayCreationDefaultInitSuffix = function (ctx) {
         var dimExprs = this.visit(ctx.dimExprs);
         var dims = this.visit(ctx.dims);
-        return printer_utils_1.rejectAndConcat([dimExprs, dims]);
+        return (0, printer_utils_1.rejectAndConcat)([dimExprs, dims]);
     };
     ExpressionsPrettierVisitor.prototype.arrayCreationExplicitInitSuffix = function (ctx) {
         var dims = this.visit(ctx.dims);
         var arrayInitializer = this.visit(ctx.arrayInitializer);
-        return printer_utils_1.rejectAndJoin(" ", [dims, arrayInitializer]);
+        return (0, printer_utils_1.rejectAndJoin)(" ", [dims, arrayInitializer]);
     };
     ExpressionsPrettierVisitor.prototype.dimExprs = function (ctx) {
         var dimExpr = this.mapVisit(ctx.dimExpr);
-        return printer_utils_1.rejectAndConcat(dimExpr);
+        return (0, printer_utils_1.rejectAndConcat)(dimExpr);
     };
     ExpressionsPrettierVisitor.prototype.dimExpr = function (ctx) {
         var annotations = this.mapVisit(ctx.annotation);
         var expression = this.visit(ctx.expression);
-        return printer_utils_1.rejectAndJoin(" ", [
-            printer_utils_1.rejectAndJoin(" ", annotations),
-            printer_utils_1.rejectAndConcat([ctx.LSquare[0], expression, ctx.RSquare[0]])
+        return (0, printer_utils_1.rejectAndJoin)(" ", [
+            (0, printer_utils_1.rejectAndJoin)(" ", annotations),
+            (0, printer_utils_1.rejectAndConcat)([ctx.LSquare[0], expression, ctx.RSquare[0]])
         ]);
     };
     ExpressionsPrettierVisitor.prototype.classLiteralSuffix = function (ctx) {
         var squares = [];
         if (ctx.LSquare) {
             for (var i = 0; i < ctx.LSquare.length; i++) {
-                squares.push(prettier_builder_1.concat([ctx.LSquare[i], ctx.RSquare[i]]));
+                squares.push((0, prettier_builder_1.concat)([ctx.LSquare[i], ctx.RSquare[i]]));
             }
         }
-        return printer_utils_1.rejectAndConcat(__spreadArray(__spreadArray([], squares), [ctx.Dot[0], ctx.Class[0]]));
+        return (0, printer_utils_1.rejectAndConcat)(__spreadArray(__spreadArray([], squares, true), [ctx.Dot[0], ctx.Class[0]], false));
     };
     ExpressionsPrettierVisitor.prototype.arrayAccessSuffix = function (ctx) {
         var expression = this.visit(ctx.expression);
-        return printer_utils_1.rejectAndConcat([ctx.LSquare[0], expression, ctx.RSquare[0]]);
+        return (0, printer_utils_1.rejectAndConcat)([ctx.LSquare[0], expression, ctx.RSquare[0]]);
     };
     ExpressionsPrettierVisitor.prototype.methodReferenceSuffix = function (ctx) {
         var typeArguments = this.visit(ctx.typeArguments);
         var identifierOrNew = ctx.New ? ctx.New[0] : ctx.Identifier[0];
-        return printer_utils_1.rejectAndConcat([ctx.ColonColon[0], typeArguments, identifierOrNew]);
+        return (0, printer_utils_1.rejectAndConcat)([ctx.ColonColon[0], typeArguments, identifierOrNew]);
     };
     ExpressionsPrettierVisitor.prototype.pattern = function (ctx) {
-        return this.visitSingle(ctx);
+        var primaryPattern = this.visit(ctx.primaryPattern);
+        if (ctx.AndAnd === undefined) {
+            return primaryPattern;
+        }
+        var binaryExpression = this.visit(ctx.binaryExpression);
+        return (0, printer_utils_1.rejectAndConcat)([
+            primaryPattern,
+            " ",
+            ctx.AndAnd[0],
+            line,
+            binaryExpression
+        ]);
+    };
+    ExpressionsPrettierVisitor.prototype.primaryPattern = function (ctx) {
+        if (ctx.LBrace === undefined) {
+            return this.visitSingle(ctx);
+        }
+        var pattern = this.visit(ctx.pattern);
+        return (0, printer_utils_1.putIntoBraces)(pattern, softline, ctx.LBrace[0], ctx.RBrace[0]);
     };
     ExpressionsPrettierVisitor.prototype.typePattern = function (ctx) {
         return this.visitSingle(ctx);