prettier-plugin-java 1.6.2 → 2.1.0

package/LICENSE

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

package/dist/base-cst-printer.js

@@ -32,12 +32,12 @@ var BaseCstPrettierPrinter = /** @class */ (function (_super) {
         _this.getSingle = function (ctx) {
             var ctxKeys = Object.keys(ctx);
             if (ctxKeys.length !== 1) {
-                throw Error("Expecting single key CST ctx but found: <" + ctxKeys.length + "> keys");
+                throw Error("Expecting single key CST ctx but found: <".concat(ctxKeys.length, "> keys"));
             }
             var singleElementKey = ctxKeys[0];
             var singleElementValues = ctx[singleElementKey];
             if ((singleElementValues === null || singleElementValues === void 0 ? void 0 : singleElementValues.length) !== 1) {
-                throw Error("Expecting single item in CST ctx key but found: <" + (singleElementValues === null || singleElementValues === void 0 ? void 0 : singleElementValues.length) + "> items");
+                throw Error("Expecting single item in CST ctx key but found: <".concat(singleElementValues === null || singleElementValues === void 0 ? void 0 : singleElementValues.length, "> items"));
             }
             return singleElementValues[0];
         };
@@ -64,7 +64,7 @@ var BaseCstPrettierPrinter = /** @class */ (function (_super) {
                         "\nThere might be a problem with prettier-ignore, please report an issue on https://github.com/jhipster/prettier-java/issues");
                 }
             }
-            return format_comments_1.printNodeWithComments(node, this.orgVisit.call(this, node, inParam));
+            return (0, format_comments_1.printNodeWithComments)(node, this.orgVisit.call(this, node, inParam));
         };
         _this.visitSingle = function (ctx, params) {
             var singleElement = this.getSingle(ctx);

package/dist/index.js

@@ -22,8 +22,8 @@ function locStart( /* node */) {
 function locEnd( /* node */) {
     return -1;
 }
-function hasPragma( /* text */) {
-    return false;
+function hasPragma(text) {
+    return /^\/\*\*[\n][\t\s]+\*\s@(prettier|format)[\n][\t\s]+\*\//.test(text);
 }
 var parsers = {
     java: {

package/dist/options.js

@@ -171,6 +171,7 @@ module.exports = {
             { value: "arrayAccessSuffix" },
             { value: "methodReferenceSuffix" },
             { value: "pattern" },
+            { value: "primaryPattern" },
             { value: "typePattern" },
             { value: "identifyNewExpressionType" },
             { value: "isLambdaExpression" },

package/dist/printers/arrays.js

@@ -27,7 +27,7 @@ var ArraysPrettierVisitor = /** @class */ (function (_super) {
     }
     ArraysPrettierVisitor.prototype.arrayInitializer = function (ctx) {
         var optionalVariableInitializerList = this.visit(ctx.variableInitializerList);
-        return printer_utils_1.printArrayList({
+        return (0, printer_utils_1.printArrayList)({
             list: optionalVariableInitializerList,
             extraComma: ctx.Comma,
             LCurly: ctx.LCurly[0],
@@ -39,10 +39,10 @@ var ArraysPrettierVisitor = /** @class */ (function (_super) {
         var variableInitializers = this.mapVisit(ctx.variableInitializer);
         var commas = ctx.Comma
             ? ctx.Comma.map(function (comma) {
-                return printer_utils_1.rejectAndConcat([comma, line]);
+                return (0, printer_utils_1.rejectAndConcat)([comma, line]);
             })
             : [];
-        return printer_utils_1.rejectAndJoinSeps(commas, variableInitializers);
+        return (0, printer_utils_1.rejectAndJoinSeps)(commas, variableInitializers);
     };
     return ArraysPrettierVisitor;
 }(base_cst_printer_1.BaseCstPrettierPrinter));

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

@@ -25,10 +25,14 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-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));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlocksAndStatementPrettierVisitor = void 0;
@@ -46,30 +50,30 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
     }
     BlocksAndStatementPrettierVisitor.prototype.block = function (ctx) {
         var blockStatements = this.visit(ctx.blockStatements);
-        return printer_utils_1.putIntoBraces(blockStatements, hardline, ctx.LCurly[0], ctx.RCurly[0]);
+        return (0, printer_utils_1.putIntoBraces)(blockStatements, hardline, ctx.LCurly[0], ctx.RCurly[0]);
     };
     BlocksAndStatementPrettierVisitor.prototype.blockStatements = function (ctx) {
         var blockStatement = this.mapVisit(ctx.blockStatement);
-        var separators = printer_utils_1.rejectSeparators(printer_utils_1.getBlankLinesSeparator(ctx.blockStatement), blockStatement);
-        return printer_utils_1.rejectAndJoinSeps(separators, blockStatement);
+        var separators = (0, printer_utils_1.rejectSeparators)((0, printer_utils_1.getBlankLinesSeparator)(ctx.blockStatement), blockStatement);
+        return (0, printer_utils_1.rejectAndJoinSeps)(separators, blockStatement);
     };
     BlocksAndStatementPrettierVisitor.prototype.blockStatement = function (ctx) {
         return this.visitSingle(ctx);
     };
     BlocksAndStatementPrettierVisitor.prototype.localVariableDeclarationStatement = function (ctx) {
         var localVariableDeclaration = this.visit(ctx.localVariableDeclaration);
-        return printer_utils_1.rejectAndConcat([localVariableDeclaration, ctx.Semicolon[0]]);
+        return (0, printer_utils_1.rejectAndConcat)([localVariableDeclaration, ctx.Semicolon[0]]);
     };
     BlocksAndStatementPrettierVisitor.prototype.localVariableDeclaration = function (ctx) {
-        var modifiers = printer_utils_1.sortModifiers(ctx.variableModifier);
+        var modifiers = (0, printer_utils_1.sortModifiers)(ctx.variableModifier);
         var firstAnnotations = this.mapVisit(modifiers[0]);
         var finalModifiers = this.mapVisit(modifiers[1]);
         var localVariableType = this.visit(ctx.localVariableType);
         var variableDeclaratorList = this.visit(ctx.variableDeclaratorList);
-        return printer_utils_1.rejectAndJoin(hardline, [
-            printer_utils_1.rejectAndJoin(hardline, firstAnnotations),
-            printer_utils_1.rejectAndJoin(" ", [
-                printer_utils_1.rejectAndJoin(" ", finalModifiers),
+        return (0, printer_utils_1.rejectAndJoin)(hardline, [
+            (0, printer_utils_1.rejectAndJoin)(hardline, firstAnnotations),
+            (0, printer_utils_1.rejectAndJoin)(" ", [
+                (0, printer_utils_1.rejectAndJoin)(" ", finalModifiers),
                 localVariableType,
                 variableDeclaratorList
             ])
@@ -79,7 +83,7 @@ var BlocksAndStatementPrettierVisitor = /** @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));
     };
     BlocksAndStatementPrettierVisitor.prototype.statement = function (ctx, params) {
         // handling Labeled statements comments
@@ -109,16 +113,16 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
         return this.visitSingle(ctx, params);
     };
     BlocksAndStatementPrettierVisitor.prototype.emptyStatement = function (ctx, params) {
-        return printer_utils_1.displaySemicolon(ctx.Semicolon[0], params);
+        return (0, printer_utils_1.displaySemicolon)(ctx.Semicolon[0], params);
     };
     BlocksAndStatementPrettierVisitor.prototype.labeledStatement = function (ctx) {
         var identifier = ctx.Identifier[0];
         var statement = this.visit(ctx.statement);
-        return printer_utils_1.rejectAndJoin(ctx.Colon[0], [identifier, statement]);
+        return (0, printer_utils_1.rejectAndJoin)(ctx.Colon[0], [identifier, statement]);
     };
     BlocksAndStatementPrettierVisitor.prototype.expressionStatement = function (ctx) {
         var statementExpression = this.visit(ctx.statementExpression);
-        return printer_utils_1.rejectAndConcat([statementExpression, ctx.Semicolon[0]]);
+        return (0, printer_utils_1.rejectAndConcat)([statementExpression, ctx.Semicolon[0]]);
     };
     BlocksAndStatementPrettierVisitor.prototype.statementExpression = function (ctx) {
         return this.visitSingle(ctx);
@@ -128,27 +132,27 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
         var ifStatement = this.visit(ctx.statement[0], {
             allowEmptyStatement: true
         });
-        var ifSeparator = printer_utils_1.isStatementEmptyStatement(ifStatement) ? "" : " ";
+        var ifSeparator = (0, printer_utils_1.isStatementEmptyStatement)(ifStatement) ? "" : " ";
         var elsePart = "";
         if (ctx.Else !== undefined) {
             var elseStatement = this.visit(ctx.statement[1], {
                 allowEmptyStatement: true
             });
-            var elseSeparator = printer_utils_1.isStatementEmptyStatement(elseStatement) ? "" : " ";
-            var elseOnSameLine = comments_utils_1.hasTrailingLineComments(ctx.statement[0]) ||
-                comments_utils_1.hasLeadingLineComments(ctx.Else[0])
+            var elseSeparator = (0, printer_utils_1.isStatementEmptyStatement)(elseStatement) ? "" : " ";
+            var elseOnSameLine = (0, comments_utils_1.hasTrailingLineComments)(ctx.statement[0]) ||
+                (0, comments_utils_1.hasLeadingLineComments)(ctx.Else[0])
                 ? hardline
                 : " ";
-            elsePart = printer_utils_1.rejectAndJoin(elseSeparator, [
-                prettier_builder_1.concat([elseOnSameLine, ctx.Else[0]]),
+            elsePart = (0, printer_utils_1.rejectAndJoin)(elseSeparator, [
+                (0, prettier_builder_1.concat)([elseOnSameLine, ctx.Else[0]]),
                 elseStatement
             ]);
         }
-        return printer_utils_1.rejectAndConcat([
-            printer_utils_1.rejectAndJoin(" ", [
+        return (0, printer_utils_1.rejectAndConcat)([
+            (0, printer_utils_1.rejectAndJoin)(" ", [
                 ctx.If[0],
-                prettier_builder_1.concat([
-                    printer_utils_1.putIntoBraces(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
+                (0, prettier_builder_1.concat)([
+                    (0, printer_utils_1.putIntoBraces)(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
                     ifSeparator
                 ])
             ]),
@@ -159,18 +163,18 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
     BlocksAndStatementPrettierVisitor.prototype.assertStatement = function (ctx) {
         var expressions = this.mapVisit(ctx.expression);
         var colon = ctx.Colon ? ctx.Colon[0] : ":";
-        return printer_utils_1.rejectAndConcat([
-            prettier_builder_1.concat([ctx.Assert[0], " "]),
-            printer_utils_1.rejectAndJoin(prettier_builder_1.concat([" ", colon, " "]), expressions),
+        return (0, printer_utils_1.rejectAndConcat)([
+            (0, prettier_builder_1.concat)([ctx.Assert[0], " "]),
+            (0, printer_utils_1.rejectAndJoin)((0, prettier_builder_1.concat)([" ", colon, " "]), expressions),
             ctx.Semicolon[0]
         ]);
     };
     BlocksAndStatementPrettierVisitor.prototype.switchStatement = function (ctx) {
         var expression = this.visit(ctx.expression);
         var switchBlock = this.visit(ctx.switchBlock);
-        return printer_utils_1.rejectAndJoin(" ", [
+        return (0, printer_utils_1.rejectAndJoin)(" ", [
             ctx.Switch[0],
-            printer_utils_1.putIntoBraces(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
+            (0, printer_utils_1.putIntoBraces)(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
             switchBlock
         ]);
     };
@@ -178,40 +182,40 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
         var switchCases = ctx.switchBlockStatementGroup !== undefined
             ? this.mapVisit(ctx.switchBlockStatementGroup)
             : this.mapVisit(ctx.switchRule);
-        return printer_utils_1.putIntoBraces(printer_utils_1.rejectAndJoin(hardline, switchCases), hardline, ctx.LCurly[0], ctx.RCurly[0]);
+        return (0, printer_utils_1.putIntoBraces)((0, printer_utils_1.rejectAndJoin)(hardline, switchCases), hardline, ctx.LCurly[0], ctx.RCurly[0]);
     };
     BlocksAndStatementPrettierVisitor.prototype.switchBlockStatementGroup = function (ctx) {
         var switchLabel = this.visit(ctx.switchLabel);
         var blockStatements = this.visit(ctx.blockStatements);
-        return prettier_builder_1.concat([
+        return (0, prettier_builder_1.concat)([
             switchLabel,
             ctx.Colon[0],
-            blockStatements && prettier_builder_1.indent([hardline, blockStatements])
+            blockStatements && (0, prettier_builder_1.indent)([hardline, blockStatements])
         ]);
     };
     BlocksAndStatementPrettierVisitor.prototype.switchLabel = function (ctx) {
         var caseOrDefaultLabels = this.mapVisit(ctx.caseOrDefaultLabel);
         var colons = ctx.Colon
             ? ctx.Colon.map(function (elt) {
-                return prettier_builder_1.concat([elt, hardline]);
+                return (0, prettier_builder_1.concat)([elt, hardline]);
             })
             : [];
-        return prettier_builder_1.group(printer_utils_1.rejectAndJoinSeps(colons, caseOrDefaultLabels));
+        return (0, prettier_builder_1.group)((0, printer_utils_1.rejectAndJoinSeps)(colons, caseOrDefaultLabels));
     };
     BlocksAndStatementPrettierVisitor.prototype.caseOrDefaultLabel = function (ctx) {
         if (ctx.Case) {
             var caseLabelElements = this.mapVisit(ctx.caseLabelElement);
             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 prettier_builder_1.group(prettier_builder_1.indent(printer_utils_1.rejectAndConcat([
-                prettier_builder_1.concat([ctx.Case[0], " "]),
-                printer_utils_1.rejectAndJoinSeps(commas, caseLabelElements)
+            return (0, prettier_builder_1.group)((0, prettier_builder_1.indent)((0, printer_utils_1.rejectAndConcat)([
+                (0, prettier_builder_1.concat)([ctx.Case[0], " "]),
+                (0, printer_utils_1.rejectAndJoinSeps)(commas, caseLabelElements)
             ])));
         }
-        return prettier_builder_1.concat([ctx.Default[0]]);
+        return (0, prettier_builder_1.concat)([ctx.Default[0]]);
     };
     BlocksAndStatementPrettierVisitor.prototype.caseLabelElement = function (ctx) {
         if (ctx.Default || ctx.Null) {
@@ -229,9 +233,9 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
             caseInstruction = this.visit(ctx.block);
         }
         else {
-            caseInstruction = prettier_builder_1.concat([this.visit(ctx.expression), ctx.Semicolon[0]]);
+            caseInstruction = (0, prettier_builder_1.concat)([this.visit(ctx.expression), ctx.Semicolon[0]]);
         }
-        return prettier_builder_1.join(" ", [switchLabel, ctx.Arrow[0], caseInstruction]);
+        return (0, prettier_builder_1.join)(" ", [switchLabel, ctx.Arrow[0], caseInstruction]);
     };
     BlocksAndStatementPrettierVisitor.prototype.caseConstant = function (ctx) {
         return this.visitSingle(ctx);
@@ -241,11 +245,11 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
         var statement = this.visit(ctx.statement[0], {
             allowEmptyStatement: true
         });
-        var statementSeparator = printer_utils_1.isStatementEmptyStatement(statement) ? "" : " ";
-        return printer_utils_1.rejectAndJoin(" ", [
+        var statementSeparator = (0, printer_utils_1.isStatementEmptyStatement)(statement) ? "" : " ";
+        return (0, printer_utils_1.rejectAndJoin)(" ", [
             ctx.While[0],
-            printer_utils_1.rejectAndJoin(statementSeparator, [
-                printer_utils_1.putIntoBraces(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
+            (0, printer_utils_1.rejectAndJoin)(statementSeparator, [
+                (0, printer_utils_1.putIntoBraces)(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
                 statement
             ])
         ]);
@@ -254,13 +258,13 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
         var statement = this.visit(ctx.statement[0], {
             allowEmptyStatement: true
         });
-        var statementSeparator = printer_utils_1.isStatementEmptyStatement(statement) ? "" : " ";
+        var statementSeparator = (0, printer_utils_1.isStatementEmptyStatement)(statement) ? "" : " ";
         var expression = this.visit(ctx.expression);
-        return printer_utils_1.rejectAndJoin(" ", [
-            printer_utils_1.rejectAndJoin(statementSeparator, [ctx.Do[0], statement]),
+        return (0, printer_utils_1.rejectAndJoin)(" ", [
+            (0, printer_utils_1.rejectAndJoin)(statementSeparator, [ctx.Do[0], statement]),
             ctx.While[0],
-            printer_utils_1.rejectAndConcat([
-                printer_utils_1.putIntoBraces(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
+            (0, printer_utils_1.rejectAndConcat)([
+                (0, printer_utils_1.putIntoBraces)(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
                 ctx.Semicolon[0]
             ])
         ]);
@@ -275,14 +279,14 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
         var statement = this.visit(ctx.statement[0], {
             allowEmptyStatement: true
         });
-        var statementSeparator = printer_utils_1.isStatementEmptyStatement(statement) ? "" : " ";
-        return printer_utils_1.rejectAndConcat([
-            printer_utils_1.rejectAndJoin(" ", [
+        var statementSeparator = (0, printer_utils_1.isStatementEmptyStatement)(statement) ? "" : " ";
+        return (0, printer_utils_1.rejectAndConcat)([
+            (0, printer_utils_1.rejectAndJoin)(" ", [
                 ctx.For[0],
-                printer_utils_1.putIntoBraces(printer_utils_1.rejectAndConcat([
+                (0, printer_utils_1.putIntoBraces)((0, printer_utils_1.rejectAndConcat)([
                     forInit,
-                    printer_utils_1.rejectAndJoin(line, [ctx.Semicolon[0], expression]),
-                    printer_utils_1.rejectAndJoin(line, [ctx.Semicolon[1], forUpdate])
+                    (0, printer_utils_1.rejectAndJoin)(line, [ctx.Semicolon[0], expression]),
+                    (0, printer_utils_1.rejectAndJoin)(line, [ctx.Semicolon[1], forUpdate])
                 ]), softline, ctx.LBrace[0], ctx.RBrace[0])
             ]),
             statementSeparator,
@@ -299,10 +303,10 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
         var statementExpressions = this.mapVisit(ctx.statementExpression);
         var commas = ctx.Comma
             ? ctx.Comma.map(function (elt) {
-                return prettier_builder_1.concat([format_comments_1.printTokenWithComments(elt), " "]);
+                return (0, prettier_builder_1.concat)([(0, format_comments_1.printTokenWithComments)(elt), " "]);
             })
             : [];
-        return printer_utils_1.rejectAndJoinSeps(commas, statementExpressions);
+        return (0, printer_utils_1.rejectAndJoinSeps)(commas, statementExpressions);
     };
     BlocksAndStatementPrettierVisitor.prototype.enhancedForStatement = function (ctx) {
         var variableModifiers = this.mapVisit(ctx.variableModifier);
@@ -312,59 +316,59 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
         var statement = this.visit(ctx.statement[0], {
             allowEmptyStatement: true
         });
-        var statementSeparator = printer_utils_1.isStatementEmptyStatement(statement) ? "" : " ";
-        return printer_utils_1.rejectAndConcat([
-            printer_utils_1.rejectAndJoin(" ", [ctx.For[0], ctx.LBrace[0]]),
-            printer_utils_1.rejectAndJoin(" ", [
-                printer_utils_1.rejectAndJoin(" ", variableModifiers),
+        var statementSeparator = (0, printer_utils_1.isStatementEmptyStatement)(statement) ? "" : " ";
+        return (0, printer_utils_1.rejectAndConcat)([
+            (0, printer_utils_1.rejectAndJoin)(" ", [ctx.For[0], ctx.LBrace[0]]),
+            (0, printer_utils_1.rejectAndJoin)(" ", [
+                (0, printer_utils_1.rejectAndJoin)(" ", variableModifiers),
                 localVariableType,
                 variableDeclaratorId
             ]),
-            prettier_builder_1.concat([" ", ctx.Colon[0], " "]),
+            (0, prettier_builder_1.concat)([" ", ctx.Colon[0], " "]),
             expression,
-            prettier_builder_1.concat([ctx.RBrace[0], statementSeparator]),
+            (0, prettier_builder_1.concat)([ctx.RBrace[0], statementSeparator]),
             statement
         ]);
     };
     BlocksAndStatementPrettierVisitor.prototype.breakStatement = function (ctx) {
         if (ctx.Identifier) {
             var identifier = ctx.Identifier[0];
-            return printer_utils_1.rejectAndConcat([
-                prettier_builder_1.concat([ctx.Break[0], " "]),
+            return (0, printer_utils_1.rejectAndConcat)([
+                (0, prettier_builder_1.concat)([ctx.Break[0], " "]),
                 identifier,
                 ctx.Semicolon[0]
             ]);
         }
-        return prettier_builder_1.concat([ctx.Break[0], ctx.Semicolon[0]]);
+        return (0, prettier_builder_1.concat)([ctx.Break[0], ctx.Semicolon[0]]);
     };
     BlocksAndStatementPrettierVisitor.prototype.continueStatement = function (ctx) {
         if (ctx.Identifier) {
             var identifier = ctx.Identifier[0];
-            return printer_utils_1.rejectAndConcat([
-                prettier_builder_1.concat([ctx.Continue[0], " "]),
+            return (0, printer_utils_1.rejectAndConcat)([
+                (0, prettier_builder_1.concat)([ctx.Continue[0], " "]),
                 identifier,
                 ctx.Semicolon[0]
             ]);
         }
-        return printer_utils_1.rejectAndConcat([ctx.Continue[0], ctx.Semicolon[0]]);
+        return (0, printer_utils_1.rejectAndConcat)([ctx.Continue[0], ctx.Semicolon[0]]);
     };
     BlocksAndStatementPrettierVisitor.prototype.returnStatement = function (ctx) {
         if (ctx.expression) {
             var expression = this.visit(ctx.expression, {
                 addParenthesisToWrapStatement: true
             });
-            return printer_utils_1.rejectAndConcat([
-                prettier_builder_1.concat([ctx.Return[0], " "]),
+            return (0, printer_utils_1.rejectAndConcat)([
+                (0, prettier_builder_1.concat)([ctx.Return[0], " "]),
                 expression,
                 ctx.Semicolon[0]
             ]);
         }
-        return printer_utils_1.rejectAndConcat([ctx.Return[0], ctx.Semicolon[0]]);
+        return (0, printer_utils_1.rejectAndConcat)([ctx.Return[0], ctx.Semicolon[0]]);
     };
     BlocksAndStatementPrettierVisitor.prototype.throwStatement = function (ctx) {
         var expression = this.visit(ctx.expression);
-        return printer_utils_1.rejectAndConcat([
-            prettier_builder_1.concat([ctx.Throw[0], " "]),
+        return (0, printer_utils_1.rejectAndConcat)([
+            (0, prettier_builder_1.concat)([ctx.Throw[0], " "]),
             expression,
             ctx.Semicolon[0]
         ]);
@@ -372,11 +376,11 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
     BlocksAndStatementPrettierVisitor.prototype.synchronizedStatement = function (ctx) {
         var expression = this.visit(ctx.expression);
         var block = this.visit(ctx.block);
-        return printer_utils_1.rejectAndConcat([
-            prettier_builder_1.join(" ", [
+        return (0, printer_utils_1.rejectAndConcat)([
+            (0, prettier_builder_1.join)(" ", [
                 ctx.Synchronized[0],
-                prettier_builder_1.concat([
-                    printer_utils_1.putIntoBraces(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
+                (0, prettier_builder_1.concat)([
+                    (0, printer_utils_1.putIntoBraces)(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
                     " "
                 ])
             ]),
@@ -390,21 +394,21 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
         var block = this.visit(ctx.block);
         var catches = this.visit(ctx.catches);
         var finallyBlock = this.visit(ctx.finally);
-        return printer_utils_1.rejectAndJoin(" ", [ctx.Try[0], block, catches, finallyBlock]);
+        return (0, printer_utils_1.rejectAndJoin)(" ", [ctx.Try[0], block, catches, finallyBlock]);
     };
     BlocksAndStatementPrettierVisitor.prototype.catches = function (ctx) {
         var catchClauses = this.mapVisit(ctx.catchClause);
-        return printer_utils_1.rejectAndJoin(" ", catchClauses);
+        return (0, printer_utils_1.rejectAndJoin)(" ", catchClauses);
     };
     BlocksAndStatementPrettierVisitor.prototype.catchClause = function (ctx) {
         var catchFormalParameter = this.visit(ctx.catchFormalParameter);
         var block = this.visit(ctx.block);
-        return printer_utils_1.rejectAndConcat([
-            prettier_builder_1.group(printer_utils_1.rejectAndConcat([
-                printer_utils_1.rejectAndJoin(" ", [ctx.Catch[0], ctx.LBrace[0]]),
-                prettier_builder_1.indent(printer_utils_1.rejectAndConcat([softline, catchFormalParameter])),
+        return (0, printer_utils_1.rejectAndConcat)([
+            (0, prettier_builder_1.group)((0, printer_utils_1.rejectAndConcat)([
+                (0, printer_utils_1.rejectAndJoin)(" ", [ctx.Catch[0], ctx.LBrace[0]]),
+                (0, prettier_builder_1.indent)((0, printer_utils_1.rejectAndConcat)([softline, catchFormalParameter])),
                 softline,
-                prettier_builder_1.concat([ctx.RBrace[0], " "])
+                (0, prettier_builder_1.concat)([ctx.RBrace[0], " "])
             ])),
             block
         ]);
@@ -413,8 +417,8 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
         var variableModifiers = this.mapVisit(ctx.variableModifier);
         var catchType = this.visit(ctx.catchType);
         var variableDeclaratorId = this.visit(ctx.variableDeclaratorId);
-        return printer_utils_1.rejectAndJoin(" ", [
-            printer_utils_1.rejectAndJoin(" ", variableModifiers),
+        return (0, printer_utils_1.rejectAndJoin)(" ", [
+            (0, printer_utils_1.rejectAndJoin)(" ", variableModifiers),
             catchType,
             variableDeclaratorId
         ]);
@@ -422,19 +426,19 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
     BlocksAndStatementPrettierVisitor.prototype.catchType = function (ctx) {
         var unannClassType = this.visit(ctx.unannClassType);
         var classTypes = this.mapVisit(ctx.classType);
-        var ors = ctx.Or ? ctx.Or.map(function (elt) { return prettier_builder_1.concat([line, elt, " "]); }) : [];
-        return prettier_builder_1.group(printer_utils_1.rejectAndJoinSeps(ors, __spreadArray([unannClassType], classTypes)));
+        var ors = ctx.Or ? ctx.Or.map(function (elt) { return (0, prettier_builder_1.concat)([line, elt, " "]); }) : [];
+        return (0, prettier_builder_1.group)((0, printer_utils_1.rejectAndJoinSeps)(ors, __spreadArray([unannClassType], classTypes, true)));
     };
     BlocksAndStatementPrettierVisitor.prototype.finally = function (ctx) {
         var block = this.visit(ctx.block);
-        return printer_utils_1.rejectAndJoin(" ", [ctx.Finally[0], block]);
+        return (0, printer_utils_1.rejectAndJoin)(" ", [ctx.Finally[0], block]);
     };
     BlocksAndStatementPrettierVisitor.prototype.tryWithResourcesStatement = function (ctx) {
         var resourceSpecification = this.visit(ctx.resourceSpecification);
         var block = this.visit(ctx.block);
         var catches = this.visit(ctx.catches);
         var finallyBlock = this.visit(ctx.finally);
-        return printer_utils_1.rejectAndJoin(" ", [
+        return (0, printer_utils_1.rejectAndJoin)(" ", [
             ctx.Try[0],
             resourceSpecification,
             block,
@@ -445,16 +449,16 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
     BlocksAndStatementPrettierVisitor.prototype.resourceSpecification = function (ctx) {
         var resourceList = this.visit(ctx.resourceList);
         var optionalSemicolon = ctx.Semicolon ? ctx.Semicolon[0] : "";
-        return printer_utils_1.putIntoBraces(printer_utils_1.rejectAndConcat([resourceList, optionalSemicolon]), softline, ctx.LBrace[0], ctx.RBrace[0]);
+        return (0, printer_utils_1.putIntoBraces)((0, printer_utils_1.rejectAndConcat)([resourceList, optionalSemicolon]), softline, ctx.LBrace[0], ctx.RBrace[0]);
     };
     BlocksAndStatementPrettierVisitor.prototype.resourceList = function (ctx) {
         var resources = this.mapVisit(ctx.resource);
         var semicolons = ctx.Semicolon
             ? ctx.Semicolon.map(function (elt) {
-                return prettier_builder_1.concat([elt, line]);
+                return (0, prettier_builder_1.concat)([elt, line]);
             })
             : [""];
-        return printer_utils_1.rejectAndJoinSeps(semicolons, resources);
+        return (0, printer_utils_1.rejectAndJoinSeps)(semicolons, resources);
     };
     BlocksAndStatementPrettierVisitor.prototype.resource = function (ctx) {
         return this.visitSingle(ctx);
@@ -464,8 +468,8 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
         var localVariableType = this.visit(ctx.localVariableType);
         var identifier = ctx.Identifier[0];
         var expression = this.visit(ctx.expression);
-        return printer_utils_1.rejectAndJoin(" ", [
-            printer_utils_1.rejectAndJoin(" ", variableModifiers),
+        return (0, printer_utils_1.rejectAndJoin)(" ", [
+            (0, printer_utils_1.rejectAndJoin)(" ", variableModifiers),
             localVariableType,
             identifier,
             ctx.Equals[0],
@@ -474,7 +478,7 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
     };
     BlocksAndStatementPrettierVisitor.prototype.yieldStatement = function (ctx) {
         var expression = this.visit(ctx.expression);
-        return prettier_builder_1.join(" ", [ctx.Yield[0], prettier_builder_1.concat([expression, ctx.Semicolon[0]])]);
+        return (0, prettier_builder_1.join)(" ", [ctx.Yield[0], (0, prettier_builder_1.concat)([expression, ctx.Semicolon[0]])]);
     };
     BlocksAndStatementPrettierVisitor.prototype.variableAccess = function (ctx) {
         return this.visitSingle(ctx);