prettier-plugin-java 2.4.0 → 2.6.0

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

@@ -1,103 +1,61 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __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)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
+import { builders } from "prettier/doc";
+import { concat, group, indent, join } from "./prettier-builder.js";
+import { printTokenWithComments } from "./comments/format-comments.js";
+import { hasLeadingLineComments, hasTrailingLineComments } from "./comments/comments-utils.js";
+import { displaySemicolon, getBlankLinesSeparator, isStatementEmptyStatement, putIntoBraces, rejectAndConcat, rejectAndJoin, rejectAndJoinSeps, rejectSeparators, sortModifiers } from "./printer-utils.js";
+import { BaseCstPrettierPrinter } from "../base-cst-printer.js";
+const { line, softline, hardline } = builders;
+export class BlocksAndStatementPrettierVisitor extends BaseCstPrettierPrinter {
+    block(ctx) {
+        const blockStatements = this.visit(ctx.blockStatements);
+        return putIntoBraces(blockStatements, hardline, ctx.LCurly[0], ctx.RCurly[0]);
     }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlocksAndStatementPrettierVisitor = void 0;
-var doc_1 = require("prettier/doc");
-var prettier_builder_1 = require("./prettier-builder");
-var format_comments_1 = require("./comments/format-comments");
-var comments_utils_1 = require("./comments/comments-utils");
-var printer_utils_1 = require("./printer-utils");
-var base_cst_printer_1 = require("../base-cst-printer");
-var line = doc_1.builders.line, softline = doc_1.builders.softline, hardline = doc_1.builders.hardline;
-var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
-    __extends(BlocksAndStatementPrettierVisitor, _super);
-    function BlocksAndStatementPrettierVisitor() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    BlocksAndStatementPrettierVisitor.prototype.block = function (ctx) {
-        var blockStatements = this.visit(ctx.blockStatements);
-        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 = (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) {
+    blockStatements(ctx) {
+        const blockStatement = this.mapVisit(ctx.blockStatement);
+        const separators = rejectSeparators(getBlankLinesSeparator(ctx.blockStatement), blockStatement);
+        return rejectAndJoinSeps(separators, blockStatement);
+    }
+    blockStatement(ctx) {
         return this.visitSingle(ctx);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.localVariableDeclarationStatement = function (ctx) {
-        var localVariableDeclaration = this.visit(ctx.localVariableDeclaration);
-        return (0, printer_utils_1.rejectAndConcat)([localVariableDeclaration, ctx.Semicolon[0]]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.localVariableDeclaration = function (ctx) {
-        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 (0, printer_utils_1.rejectAndJoin)(hardline, [
-            (0, printer_utils_1.rejectAndJoin)(hardline, firstAnnotations),
-            (0, printer_utils_1.rejectAndJoin)(" ", [
-                (0, printer_utils_1.rejectAndJoin)(" ", finalModifiers),
+    }
+    localVariableDeclarationStatement(ctx) {
+        const localVariableDeclaration = this.visit(ctx.localVariableDeclaration);
+        return rejectAndConcat([localVariableDeclaration, ctx.Semicolon[0]]);
+    }
+    localVariableDeclaration(ctx) {
+        const modifiers = sortModifiers(ctx.variableModifier);
+        const firstAnnotations = this.mapVisit(modifiers[0]);
+        const finalModifiers = this.mapVisit(modifiers[1]);
+        const localVariableType = this.visit(ctx.localVariableType);
+        const variableDeclaratorList = this.visit(ctx.variableDeclaratorList);
+        return rejectAndJoin(hardline, [
+            rejectAndJoin(hardline, firstAnnotations),
+            rejectAndJoin(" ", [
+                rejectAndJoin(" ", finalModifiers),
                 localVariableType,
                 variableDeclaratorList
             ])
         ]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.localVariableType = function (ctx) {
+    }
+    localVariableType(ctx) {
         if (ctx.unannType) {
             return this.visitSingle(ctx);
         }
-        return (0, format_comments_1.printTokenWithComments)(this.getSingle(ctx));
-    };
-    BlocksAndStatementPrettierVisitor.prototype.statement = function (ctx, params) {
+        return printTokenWithComments(this.getSingle(ctx));
+    }
+    statement(ctx, params) {
         // handling Labeled statements comments
         if (ctx.labeledStatement !== undefined) {
-            var newLabelStatement = __assign({}, ctx.labeledStatement[0]);
-            var newColon = __assign({}, ctx.labeledStatement[0].children.Colon[0]);
-            var newStatement = __assign({}, ctx.labeledStatement[0].children.statement[0]);
-            var labeledStatementLeadingComments = [];
+            const newLabelStatement = Object.assign({}, ctx.labeledStatement[0]);
+            const newColon = Object.assign({}, ctx.labeledStatement[0].children.Colon[0]);
+            const newStatement = Object.assign({}, ctx.labeledStatement[0].children.statement[0]);
+            const labeledStatementLeadingComments = [];
             if (newColon.trailingComments !== undefined) {
-                labeledStatementLeadingComments.push.apply(labeledStatementLeadingComments, newColon.trailingComments);
+                labeledStatementLeadingComments.push(...newColon.trailingComments);
                 delete newColon.trailingComments;
             }
             if (newStatement.leadingComments !== undefined) {
-                labeledStatementLeadingComments.push.apply(labeledStatementLeadingComments, newStatement.leadingComments);
+                labeledStatementLeadingComments.push(...newStatement.leadingComments);
                 delete newStatement.leadingComments;
             }
             if (labeledStatementLeadingComments.length !== 0) {
@@ -108,129 +66,128 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
             return this.visit([newLabelStatement]);
         }
         return this.visitSingle(ctx, params);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.statementWithoutTrailingSubstatement = function (ctx, params) {
+    }
+    statementWithoutTrailingSubstatement(ctx, params) {
         return this.visitSingle(ctx, params);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.emptyStatement = function (ctx, 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 (0, printer_utils_1.rejectAndJoin)(ctx.Colon[0], [identifier, statement]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.expressionStatement = function (ctx) {
-        var statementExpression = this.visit(ctx.statementExpression);
-        return (0, printer_utils_1.rejectAndConcat)([statementExpression, ctx.Semicolon[0]]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.statementExpression = function (ctx) {
+    }
+    emptyStatement(ctx, params) {
+        return displaySemicolon(ctx.Semicolon[0], params);
+    }
+    labeledStatement(ctx) {
+        const identifier = ctx.Identifier[0];
+        const statement = this.visit(ctx.statement);
+        return rejectAndJoin(ctx.Colon[0], [identifier, statement]);
+    }
+    expressionStatement(ctx) {
+        const statementExpression = this.visit(ctx.statementExpression);
+        return rejectAndConcat([statementExpression, ctx.Semicolon[0]]);
+    }
+    statementExpression(ctx) {
         return this.visitSingle(ctx);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.ifStatement = function (ctx) {
-        var expression = this.visit(ctx.expression);
-        var ifStatement = this.visit(ctx.statement[0], {
+    }
+    ifStatement(ctx) {
+        var _a;
+        const expression = this.visit(ctx.expression);
+        const ifStatement = this.visit(ctx.statement[0], {
             allowEmptyStatement: true
         });
-        var ifSeparator = (0, printer_utils_1.isStatementEmptyStatement)(ifStatement) ? "" : " ";
-        var elsePart = "";
+        const ifSeparator = isStatementEmptyStatement(ifStatement) ? "" : " ";
+        let elsePart = "";
         if (ctx.Else !== undefined) {
-            var elseStatement = this.visit(ctx.statement[1], {
+            const elseStatement = this.visit(ctx.statement[1], {
                 allowEmptyStatement: true
             });
-            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])
+            const elseSeparator = isStatementEmptyStatement(elseStatement) ? "" : " ";
+            const elseOnSameLine = hasTrailingLineComments(ctx.statement[0]) ||
+                hasLeadingLineComments(ctx.Else[0]) ||
+                !((_a = ctx.statement[0].children.statementWithoutTrailingSubstatement) === null || _a === void 0 ? void 0 : _a[0].children.block)
                 ? hardline
                 : " ";
-            elsePart = (0, printer_utils_1.rejectAndJoin)(elseSeparator, [
-                (0, prettier_builder_1.concat)([elseOnSameLine, ctx.Else[0]]),
+            elsePart = rejectAndJoin(elseSeparator, [
+                concat([elseOnSameLine, ctx.Else[0]]),
                 elseStatement
             ]);
         }
-        return (0, printer_utils_1.rejectAndConcat)([
-            (0, printer_utils_1.rejectAndJoin)(" ", [
+        return rejectAndConcat([
+            rejectAndJoin(" ", [
                 ctx.If[0],
-                (0, prettier_builder_1.concat)([
-                    (0, printer_utils_1.putIntoBraces)(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
+                concat([
+                    putIntoBraces(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
                     ifSeparator
                 ])
             ]),
             ifStatement,
             elsePart
         ]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.assertStatement = function (ctx) {
-        var expressions = this.mapVisit(ctx.expression);
-        var colon = ctx.Colon ? ctx.Colon[0] : ":";
-        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),
+    }
+    assertStatement(ctx) {
+        const expressions = this.mapVisit(ctx.expression);
+        const colon = ctx.Colon ? ctx.Colon[0] : ":";
+        return rejectAndConcat([
+            concat([ctx.Assert[0], " "]),
+            rejectAndJoin(concat([" ", colon, " "]), expressions),
             ctx.Semicolon[0]
         ]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.switchStatement = function (ctx) {
-        var expression = this.visit(ctx.expression);
-        var switchBlock = this.visit(ctx.switchBlock);
-        return (0, printer_utils_1.rejectAndJoin)(" ", [
+    }
+    switchStatement(ctx) {
+        const expression = this.visit(ctx.expression);
+        const switchBlock = this.visit(ctx.switchBlock);
+        return rejectAndJoin(" ", [
             ctx.Switch[0],
-            (0, printer_utils_1.putIntoBraces)(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
+            putIntoBraces(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
             switchBlock
         ]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.switchBlock = function (ctx) {
-        var switchCases = ctx.switchBlockStatementGroup !== undefined
+    }
+    switchBlock(ctx) {
+        const switchCases = ctx.switchBlockStatementGroup !== undefined
             ? this.mapVisit(ctx.switchBlockStatementGroup)
             : this.mapVisit(ctx.switchRule);
-        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 (0, prettier_builder_1.concat)([
+        return putIntoBraces(rejectAndJoin(hardline, switchCases), hardline, ctx.LCurly[0], ctx.RCurly[0]);
+    }
+    switchBlockStatementGroup(ctx) {
+        var _a, _b, _c;
+        const switchLabel = this.visit(ctx.switchLabel);
+        const blockStatements = this.visit(ctx.blockStatements);
+        const statements = (_a = ctx.blockStatements) === null || _a === void 0 ? void 0 : _a[0].children.blockStatement;
+        const hasSingleStatementBlock = (statements === null || statements === void 0 ? void 0 : statements.length) === 1 &&
+            ((_c = (_b = statements[0].children.statement) === null || _b === void 0 ? void 0 : _b[0].children.statementWithoutTrailingSubstatement) === null || _c === void 0 ? void 0 : _c[0].children.block) !== undefined;
+        return concat([
             switchLabel,
             ctx.Colon[0],
-            blockStatements && (0, prettier_builder_1.indent)([hardline, blockStatements])
+            hasSingleStatementBlock
+                ? concat([" ", blockStatements])
+                : blockStatements && indent([hardline, blockStatements])
         ]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.switchLabel = function (ctx) {
-        var caseOrDefaultLabels = this.mapVisit(ctx.caseOrDefaultLabel);
-        var colons = ctx.Colon
-            ? ctx.Colon.map(function (elt) {
-                return (0, prettier_builder_1.concat)([elt, hardline]);
-            })
-            : [];
-        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 (0, prettier_builder_1.concat)([elt, line]);
-                })
-                : [];
-            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 (0, prettier_builder_1.concat)([ctx.Default[0]]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.caseLabelElement = function (ctx) {
-        if (ctx.Default || ctx.Null) {
-            return this.getSingle(ctx);
+    }
+    switchLabel(ctx) {
+        var _a, _b, _c;
+        const Case = (_a = ctx.Case) === null || _a === void 0 ? void 0 : _a[0];
+        const commas = (_b = ctx.Comma) === null || _b === void 0 ? void 0 : _b.map(elt => concat([elt, line]));
+        if (ctx.caseConstant || ctx.Null) {
+            const caseConstants = ctx.Null
+                ? [ctx.Null[0], (_c = ctx.Default) === null || _c === void 0 ? void 0 : _c[0]]
+                : this.mapVisit(ctx.caseConstant);
+            return group(indent(join(" ", [Case, rejectAndJoinSeps(commas, caseConstants)])));
         }
         else if (ctx.pattern) {
-            var pattern = this.visit(ctx.pattern);
-            var guard = this.visit(ctx.guard);
-            return (0, printer_utils_1.rejectAndJoin)(" ", [(0, prettier_builder_1.dedent)(pattern), guard]);
+            const patterns = this.mapVisit(ctx.pattern);
+            const guard = this.visit(ctx.guard);
+            const multiplePatterns = ctx.pattern.length > 1;
+            const separator = multiplePatterns ? line : " ";
+            const contents = join(separator, [
+                Case,
+                rejectAndJoinSeps(commas, patterns)
+            ]);
+            return group(rejectAndJoin(separator, [
+                multiplePatterns ? indent(contents) : contents,
+                guard
+            ]));
         }
-        return this.visit(ctx.caseConstant);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.switchRule = function (ctx) {
-        var switchLabel = this.visit(ctx.switchLabel);
-        var caseInstruction;
+        return printTokenWithComments(ctx.Default[0]);
+    }
+    switchRule(ctx) {
+        const switchLabel = this.visit(ctx.switchLabel);
+        let caseInstruction;
         if (ctx.throwStatement !== undefined) {
             caseInstruction = this.visit(ctx.throwStatement);
         }
@@ -238,265 +195,241 @@ var BlocksAndStatementPrettierVisitor = /** @class */ (function (_super) {
             caseInstruction = this.visit(ctx.block);
         }
         else {
-            caseInstruction = (0, prettier_builder_1.concat)([this.visit(ctx.expression), ctx.Semicolon[0]]);
+            caseInstruction = concat([this.visit(ctx.expression), ctx.Semicolon[0]]);
         }
-        return (0, prettier_builder_1.concat)([switchLabel, " ", ctx.Arrow[0], " ", caseInstruction]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.caseConstant = function (ctx) {
+        return concat([switchLabel, " ", ctx.Arrow[0], " ", caseInstruction]);
+    }
+    caseConstant(ctx) {
         return this.visitSingle(ctx);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.whileStatement = function (ctx) {
-        var expression = this.visit(ctx.expression);
-        var statement = this.visit(ctx.statement[0], {
+    }
+    whileStatement(ctx) {
+        const expression = this.visit(ctx.expression);
+        const statement = this.visit(ctx.statement[0], {
             allowEmptyStatement: true
         });
-        var statementSeparator = (0, printer_utils_1.isStatementEmptyStatement)(statement) ? "" : " ";
-        return (0, printer_utils_1.rejectAndJoin)(" ", [
+        const statementSeparator = isStatementEmptyStatement(statement) ? "" : " ";
+        return rejectAndJoin(" ", [
             ctx.While[0],
-            (0, printer_utils_1.rejectAndJoin)(statementSeparator, [
-                (0, printer_utils_1.putIntoBraces)(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
+            rejectAndJoin(statementSeparator, [
+                putIntoBraces(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
                 statement
             ])
         ]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.doStatement = function (ctx) {
-        var statement = this.visit(ctx.statement[0], {
+    }
+    doStatement(ctx) {
+        const statement = this.visit(ctx.statement[0], {
             allowEmptyStatement: true
         });
-        var statementSeparator = (0, printer_utils_1.isStatementEmptyStatement)(statement) ? "" : " ";
-        var expression = this.visit(ctx.expression);
-        return (0, printer_utils_1.rejectAndJoin)(" ", [
-            (0, printer_utils_1.rejectAndJoin)(statementSeparator, [ctx.Do[0], statement]),
+        const statementSeparator = isStatementEmptyStatement(statement) ? "" : " ";
+        const expression = this.visit(ctx.expression);
+        return rejectAndJoin(" ", [
+            rejectAndJoin(statementSeparator, [ctx.Do[0], statement]),
             ctx.While[0],
-            (0, printer_utils_1.rejectAndConcat)([
-                (0, printer_utils_1.putIntoBraces)(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
+            rejectAndConcat([
+                putIntoBraces(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
                 ctx.Semicolon[0]
             ])
         ]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.forStatement = function (ctx) {
+    }
+    forStatement(ctx) {
         return this.visitSingle(ctx);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.basicForStatement = function (ctx) {
-        var forInit = this.visit(ctx.forInit);
-        var expression = this.visit(ctx.expression);
-        var forUpdate = this.visit(ctx.forUpdate);
-        var statement = this.visit(ctx.statement[0], {
+    }
+    basicForStatement(ctx) {
+        const forInit = this.visit(ctx.forInit);
+        const expression = this.visit(ctx.expression);
+        const forUpdate = this.visit(ctx.forUpdate);
+        const statement = this.visit(ctx.statement[0], {
             allowEmptyStatement: true
         });
-        var statementSeparator = (0, printer_utils_1.isStatementEmptyStatement)(statement) ? "" : " ";
-        return (0, printer_utils_1.rejectAndConcat)([
-            (0, printer_utils_1.rejectAndJoin)(" ", [
+        const statementSeparator = isStatementEmptyStatement(statement) ? "" : " ";
+        return rejectAndConcat([
+            rejectAndJoin(" ", [
                 ctx.For[0],
-                (0, printer_utils_1.putIntoBraces)((0, printer_utils_1.rejectAndConcat)([
+                putIntoBraces(rejectAndConcat([
                     forInit,
-                    (0, printer_utils_1.rejectAndJoin)(line, [ctx.Semicolon[0], expression]),
-                    (0, printer_utils_1.rejectAndJoin)(line, [ctx.Semicolon[1], forUpdate])
+                    rejectAndJoin(line, [ctx.Semicolon[0], expression]),
+                    rejectAndJoin(line, [ctx.Semicolon[1], forUpdate])
                 ]), softline, ctx.LBrace[0], ctx.RBrace[0])
             ]),
             statementSeparator,
             statement
         ]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.forInit = function (ctx) {
+    }
+    forInit(ctx) {
         return this.visitSingle(ctx);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.forUpdate = function (ctx) {
+    }
+    forUpdate(ctx) {
         return this.visitSingle(ctx);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.statementExpressionList = function (ctx) {
-        var statementExpressions = this.mapVisit(ctx.statementExpression);
-        var commas = ctx.Comma
-            ? ctx.Comma.map(function (elt) {
-                return (0, prettier_builder_1.concat)([(0, format_comments_1.printTokenWithComments)(elt), " "]);
+    }
+    statementExpressionList(ctx) {
+        const statementExpressions = this.mapVisit(ctx.statementExpression);
+        const commas = ctx.Comma
+            ? ctx.Comma.map(elt => {
+                return concat([printTokenWithComments(elt), " "]);
             })
             : [];
-        return (0, printer_utils_1.rejectAndJoinSeps)(commas, statementExpressions);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.enhancedForStatement = function (ctx) {
-        var variableModifiers = this.mapVisit(ctx.variableModifier);
-        var localVariableType = this.visit(ctx.localVariableType);
-        var variableDeclaratorId = this.visit(ctx.variableDeclaratorId);
-        var expression = this.visit(ctx.expression);
-        var statement = this.visit(ctx.statement[0], {
+        return rejectAndJoinSeps(commas, statementExpressions);
+    }
+    enhancedForStatement(ctx) {
+        const variableModifiers = this.mapVisit(ctx.variableModifier);
+        const localVariableType = this.visit(ctx.localVariableType);
+        const variableDeclaratorId = this.visit(ctx.variableDeclaratorId);
+        const expression = this.visit(ctx.expression);
+        const statement = this.visit(ctx.statement[0], {
             allowEmptyStatement: true
         });
-        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),
+        const statementSeparator = isStatementEmptyStatement(statement) ? "" : " ";
+        return rejectAndConcat([
+            rejectAndJoin(" ", [ctx.For[0], ctx.LBrace[0]]),
+            rejectAndJoin(" ", [
+                rejectAndJoin(" ", variableModifiers),
                 localVariableType,
                 variableDeclaratorId
             ]),
-            (0, prettier_builder_1.concat)([" ", ctx.Colon[0], " "]),
+            concat([" ", ctx.Colon[0], " "]),
             expression,
-            (0, prettier_builder_1.concat)([ctx.RBrace[0], statementSeparator]),
+            concat([ctx.RBrace[0], statementSeparator]),
             statement
         ]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.breakStatement = function (ctx) {
+    }
+    breakStatement(ctx) {
         if (ctx.Identifier) {
-            var identifier = ctx.Identifier[0];
-            return (0, printer_utils_1.rejectAndConcat)([
-                (0, prettier_builder_1.concat)([ctx.Break[0], " "]),
+            const identifier = ctx.Identifier[0];
+            return rejectAndConcat([
+                concat([ctx.Break[0], " "]),
                 identifier,
                 ctx.Semicolon[0]
             ]);
         }
-        return (0, prettier_builder_1.concat)([ctx.Break[0], ctx.Semicolon[0]]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.continueStatement = function (ctx) {
+        return concat([ctx.Break[0], ctx.Semicolon[0]]);
+    }
+    continueStatement(ctx) {
         if (ctx.Identifier) {
-            var identifier = ctx.Identifier[0];
-            return (0, printer_utils_1.rejectAndConcat)([
-                (0, prettier_builder_1.concat)([ctx.Continue[0], " "]),
+            const identifier = ctx.Identifier[0];
+            return rejectAndConcat([
+                concat([ctx.Continue[0], " "]),
                 identifier,
                 ctx.Semicolon[0]
             ]);
         }
-        return (0, printer_utils_1.rejectAndConcat)([ctx.Continue[0], ctx.Semicolon[0]]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.returnStatement = function (ctx) {
+        return rejectAndConcat([ctx.Continue[0], ctx.Semicolon[0]]);
+    }
+    returnStatement(ctx) {
         if (ctx.expression) {
-            var expression = this.visit(ctx.expression, {
+            const expression = this.visit(ctx.expression, {
                 addParenthesisToWrapStatement: true
             });
-            return (0, printer_utils_1.rejectAndConcat)([
-                (0, prettier_builder_1.concat)([ctx.Return[0], " "]),
+            return rejectAndConcat([
+                concat([ctx.Return[0], " "]),
                 expression,
                 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 (0, printer_utils_1.rejectAndConcat)([
-            (0, prettier_builder_1.concat)([ctx.Throw[0], " "]),
+        return rejectAndConcat([ctx.Return[0], ctx.Semicolon[0]]);
+    }
+    throwStatement(ctx) {
+        const expression = this.visit(ctx.expression);
+        return rejectAndConcat([
+            concat([ctx.Throw[0], " "]),
             expression,
             ctx.Semicolon[0]
         ]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.synchronizedStatement = function (ctx) {
-        var expression = this.visit(ctx.expression);
-        var block = this.visit(ctx.block);
-        return (0, printer_utils_1.rejectAndConcat)([
-            (0, prettier_builder_1.join)(" ", [
+    }
+    synchronizedStatement(ctx) {
+        const expression = this.visit(ctx.expression);
+        const block = this.visit(ctx.block);
+        return rejectAndConcat([
+            join(" ", [
                 ctx.Synchronized[0],
-                (0, prettier_builder_1.concat)([
-                    (0, printer_utils_1.putIntoBraces)(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
+                concat([
+                    putIntoBraces(expression, softline, ctx.LBrace[0], ctx.RBrace[0]),
                     " "
                 ])
             ]),
             block
         ]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.tryStatement = function (ctx) {
+    }
+    tryStatement(ctx) {
         if (ctx.tryWithResourcesStatement) {
             return this.visit(ctx.tryWithResourcesStatement);
         }
-        var block = this.visit(ctx.block);
-        var catches = this.visit(ctx.catches);
-        var finallyBlock = this.visit(ctx.finally);
-        return (0, printer_utils_1.rejectAndJoin)(" ", [ctx.Try[0], block, catches, finallyBlock]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.catches = function (ctx) {
-        var catchClauses = this.mapVisit(ctx.catchClause);
-        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 (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])),
+        const block = this.visit(ctx.block);
+        const catches = this.visit(ctx.catches);
+        const finallyBlock = this.visit(ctx.finally);
+        return rejectAndJoin(" ", [ctx.Try[0], block, catches, finallyBlock]);
+    }
+    catches(ctx) {
+        const catchClauses = this.mapVisit(ctx.catchClause);
+        return rejectAndJoin(" ", catchClauses);
+    }
+    catchClause(ctx) {
+        const catchFormalParameter = this.visit(ctx.catchFormalParameter);
+        const block = this.visit(ctx.block);
+        return rejectAndConcat([
+            group(rejectAndConcat([
+                rejectAndJoin(" ", [ctx.Catch[0], ctx.LBrace[0]]),
+                indent(rejectAndConcat([softline, catchFormalParameter])),
                 softline,
-                (0, prettier_builder_1.concat)([ctx.RBrace[0], " "])
+                concat([ctx.RBrace[0], " "])
             ])),
             block
         ]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.catchFormalParameter = function (ctx) {
-        var variableModifiers = this.mapVisit(ctx.variableModifier);
-        var catchType = this.visit(ctx.catchType);
-        var variableDeclaratorId = this.visit(ctx.variableDeclaratorId);
-        return (0, printer_utils_1.rejectAndJoin)(" ", [
-            (0, printer_utils_1.rejectAndJoin)(" ", variableModifiers),
+    }
+    catchFormalParameter(ctx) {
+        const variableModifiers = this.mapVisit(ctx.variableModifier);
+        const catchType = this.visit(ctx.catchType);
+        const variableDeclaratorId = this.visit(ctx.variableDeclaratorId);
+        return rejectAndJoin(" ", [
+            rejectAndJoin(" ", variableModifiers),
             catchType,
             variableDeclaratorId
         ]);
-    };
-    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 (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 (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 (0, printer_utils_1.rejectAndJoin)(" ", [
+    }
+    catchType(ctx) {
+        const unannClassType = this.visit(ctx.unannClassType);
+        const classTypes = this.mapVisit(ctx.classType);
+        const ors = ctx.Or ? ctx.Or.map(elt => concat([line, elt, " "])) : [];
+        return group(rejectAndJoinSeps(ors, [unannClassType, ...classTypes]));
+    }
+    finally(ctx) {
+        const block = this.visit(ctx.block);
+        return rejectAndJoin(" ", [ctx.Finally[0], block]);
+    }
+    tryWithResourcesStatement(ctx) {
+        const resourceSpecification = this.visit(ctx.resourceSpecification);
+        const block = this.visit(ctx.block);
+        const catches = this.visit(ctx.catches);
+        const finallyBlock = this.visit(ctx.finally);
+        return rejectAndJoin(" ", [
             ctx.Try[0],
             resourceSpecification,
             block,
             catches,
             finallyBlock
         ]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.resourceSpecification = function (ctx) {
-        var resourceList = this.visit(ctx.resourceList);
-        var optionalSemicolon = ctx.Semicolon ? ctx.Semicolon[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 (0, prettier_builder_1.concat)([elt, line]);
+    }
+    resourceSpecification(ctx) {
+        const resourceList = this.visit(ctx.resourceList);
+        const optionalSemicolon = ctx.Semicolon ? ctx.Semicolon[0] : "";
+        return putIntoBraces(rejectAndConcat([resourceList, optionalSemicolon]), softline, ctx.LBrace[0], ctx.RBrace[0]);
+    }
+    resourceList(ctx) {
+        const resources = this.mapVisit(ctx.resource);
+        const semicolons = ctx.Semicolon
+            ? ctx.Semicolon.map(elt => {
+                return concat([elt, line]);
             })
             : [""];
-        return (0, printer_utils_1.rejectAndJoinSeps)(semicolons, resources);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.resource = function (ctx) {
+        return rejectAndJoinSeps(semicolons, resources);
+    }
+    resource(ctx) {
         return this.visitSingle(ctx);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.resourceInit = function (ctx) {
-        var variableModifiers = this.mapVisit(ctx.variableModifier);
-        var localVariableType = this.visit(ctx.localVariableType);
-        var identifier = ctx.Identifier[0];
-        var expression = this.visit(ctx.expression);
-        return (0, printer_utils_1.rejectAndJoin)(" ", [
-            (0, printer_utils_1.rejectAndJoin)(" ", variableModifiers),
-            localVariableType,
-            identifier,
-            ctx.Equals[0],
-            expression
-        ]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.yieldStatement = function (ctx) {
-        var expression = this.visit(ctx.expression);
-        return (0, prettier_builder_1.join)(" ", [ctx.Yield[0], (0, prettier_builder_1.concat)([expression, ctx.Semicolon[0]])]);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.variableAccess = function (ctx) {
+    }
+    yieldStatement(ctx) {
+        const expression = this.visit(ctx.expression);
+        return join(" ", [ctx.Yield[0], concat([expression, ctx.Semicolon[0]])]);
+    }
+    variableAccess(ctx) {
         return this.visitSingle(ctx);
-    };
-    BlocksAndStatementPrettierVisitor.prototype.isBasicForStatement = function () {
-        return "isBasicForStatement";
-    };
-    BlocksAndStatementPrettierVisitor.prototype.isLocalVariableDeclaration = function () {
-        return "isLocalVariableDeclaration";
-    };
-    BlocksAndStatementPrettierVisitor.prototype.isClassicSwitchLabel = function () {
-        return "isClassicSwitchLabel";
-    };
-    return BlocksAndStatementPrettierVisitor;
-}(base_cst_printer_1.BaseCstPrettierPrinter));
-exports.BlocksAndStatementPrettierVisitor = BlocksAndStatementPrettierVisitor;
+    }
+}