prettier-java-next-line 2.11.2 → 2.11.4

package/dist/index.mjs

@@ -178,18 +178,19 @@ function printArrayInitializer(path, print, options) {
 	const { node } = path;
 	const elements = node.namedChildren;
 	const isNested = isNestedArray(path);
+	const nextLineLayout = options.braceStyle === "next-line" && node.type === "array_initializer" ? options.arrayInitializerLayout : void 0;
 	if (elements.length === 0) {
 		const danglingComments = printDanglingCommentsInList(path);
 		if (!danglingComments) return "{}";
-		const block = group$7([
+		const block = [
 			"{",
 			danglingComments,
 			"}"
-		]);
-		return options.braceStyle === "next-line" && !isNested ? [hardline$7, block] : block;
+		];
+		if (isNested || nextLineLayout === void 0) return group$7(block);
+		return nextLineLayout === "fit" ? group$7([softline$3, ...block]) : [hardline$7, group$7(block)];
 	}
 	const groupId = Symbol("array");
-	const nextLineLayout = options.braceStyle === "next-line" && node.type === "array_initializer" ? options.arrayInitializerLayout : void 0;
 	const shouldBreak = node.comments?.some(({ type, leading, trailing }) => !leading && !trailing && type === "line_comment") || nextLineLayout !== "fit" && elements.length > 1 && elements.every((element, i, elements) => {
 		if (element.type !== "array_initializer") return false;
 		const elementType = element.type;
@@ -280,8 +281,34 @@ function printArrayElementsConcisely(path, options, print, trailingComma) {
 function isNestedArray(path) {
 	return path.parent?.type === "array_initializer" || path.parent?.type === "element_value_array_initializer";
 }
+/**
+* Separates a header such as `void m()`, `try` or `class A` from the `{` of
+* the block that follows it. Blocks never add their own leading separator.
+*/
+function printBlockSeparator(options) {
+	return options.braceStyle === "next-line" ? hardline$7 : " ";
+}
+/**
+* Separators between a declaration header and its body. With same-line braces,
+* a non-empty body's `{` moves onto its own line when the `extends`,
+* `implements` or `permits` clauses break, so that separator sits inside the
+* clause group. With next-line braces, `{` always follows the whole header on
+* its own line.
+*/
+function printDeclarationBodySeparators(hasClauses, hasBody, options) {
+	if (options.braceStyle === "next-line") return {
+		afterClauses: "",
+		afterHeader: hardline$7
+	};
+	return hasClauses ? {
+		afterClauses: hasBody ? line$7 : " ",
+		afterHeader: ""
+	} : {
+		afterClauses: "",
+		afterHeader: " "
+	};
+}
 function printBlock(path, contents, options) {
-	if (options?.braceStyle === "next-line") return printBlockNextLine(path, contents);
 	if (contents.length) return group$7([
 		"{",
 		indent$7([hardline$7, ...join$7(hardline$7, contents)]),
@@ -295,6 +322,11 @@ function printBlock(path, contents, options) {
 		hardline$7,
 		"}"
 	];
+	if (options?.braceStyle === "next-line") return [
+		"{",
+		hardline$7,
+		"}"
+	];
 	const parent = path.parent;
 	const grandparent = path.grandparent;
 	return parent?.type === "catch_clause" && (grandparent?.type === "try_statement" || grandparent?.type === "try_with_resources_statement") && grandparent.namedChildren.filter(({ type }) => type === "catch_clause").length === 1 && !grandparent.namedChildren.some(({ type }) => type === "finally_clause") || parent && [
@@ -322,42 +354,6 @@ function printBlock(path, contents, options) {
 		"}"
 	];
 }
-function printBlockNextLine(path, contents) {
-	const parentType = path.parent?.type;
-	const isChildOfBodyDeclaration = parentType != null && [
-		"annotation_type_body",
-		"class_body",
-		"enum_body",
-		"interface_body"
-	].includes(parentType);
-	const isBlockStatement = parentType != null && [
-		"block",
-		"constructor_body",
-		"switch_block_statement_group"
-	].includes(parentType);
-	const prefix = isChildOfBodyDeclaration || isBlockStatement ? [] : [hardline$7];
-	if (contents.length) return [
-		...prefix,
-		"{",
-		indent$7([hardline$7, ...join$7(hardline$7, contents)]),
-		hardline$7,
-		"}"
-	];
-	const danglingComments = printDanglingComments(path, { indent: true });
-	if (danglingComments) return [
-		...prefix,
-		"{",
-		danglingComments,
-		hardline$7,
-		"}"
-	];
-	return [
-		...prefix,
-		"{",
-		hardline$7,
-		"}"
-	];
-}
 function printBlockStatements(path, print) {
 	const parts = [];
 	path.each((child) => {
@@ -402,7 +398,7 @@ function printTypeParameters(path, print, options) {
 	return path.node.type === "type_arguments" ? group$7(parts) : parts;
 }
 function printVariableDeclaration(path, print) {
-	const declaration = printModifiers(path, print);
+	const declaration = printModifiers(path, print, path.parent?.type === "for_statement" ? "noBreak" : void 0);
 	declaration.push(path.call(print, "typeNode"), " ");
 	const declarators = path.map(print, "declaratorNodes");
 	if (declarators.length > 1 && path.node.declaratorNodes.some(({ valueNode }) => valueNode)) declaration.push(group$7(indent$7(join$7([",", line$7], declarators)), { shouldBreak: path.parent?.type !== "for_statement" }));
@@ -443,14 +439,18 @@ function isTextBlock(node) {
 	return node.type === "string_literal" && node.children[0].value === "\"\"\"";
 }
 function embedTextBlock(path, options) {
-	if (path.node.namedChildren.some(({ type }) => type === "string_interpolation") || path.node.children[0].value === "\"") return null;
+	if (path.node.namedChildren.some(({ type }) => type === "string_interpolation") || !isTextBlock(path.node)) return null;
 	const language = findEmbeddedLanguage(path);
 	if (!language) return null;
 	const parser = inferParser(options, language);
 	if (!parser) return null;
-	const text = unescapeTextBlockContents(textBlockContents(path.node));
+	const contents = textBlockContents(path.node);
+	if (/[\uE000-\uF8FF]/.test(contents)) return null;
+	const preservedEscapes = [];
+	const text = unescapeTextBlockContents(contents, preservedEscapes);
+	if (preservedEscapes.length > 6400) return null;
 	return async (textToDoc) => {
-		return printTextBlock([escapeDocForTextBlock(await textToDoc(text, { parser })), hardline$7]);
+		return printTextBlock([escapeDocForTextBlock(await textToDoc(text, { parser }), preservedEscapes), hardline$7]);
 	};
 }
 function textBlockContents(node) {
@@ -621,11 +621,19 @@ function findBaseIndent(lines) {
 function findEmbeddedLanguage(path) {
 	return [path.node, ...path.ancestors].find(({ type, comments }) => type === "block" || comments?.some(({ leading }) => leading))?.comments?.filter(({ leading }) => leading).map(({ value }) => value.match(/^(?:\/\/|\/\*)\s*language\s*=\s*(\S+)/)?.[1]).findLast((language) => language)?.toLowerCase();
 }
-function escapeDocForTextBlock(doc) {
-	return mapDoc(doc, (currentDoc) => typeof currentDoc === "string" ? currentDoc.replace(/\\|"""/g, (match) => match === "\\" ? "\\\\" : "\"\"\\\"") : currentDoc);
+function escapeDocForTextBlock(doc, preservedEscapes) {
+	return mapDoc(doc, (currentDoc) => typeof currentDoc === "string" ? currentDoc.replace(/\\|"""|[\uE000-\uF8FF]/g, (match) => match === "\\" ? "\\\\" : match === "\"\"\"" ? "\"\"\\\"" : preservedEscapes[match.charCodeAt(0) - 57344] ?? match) : currentDoc);
 }
-function unescapeTextBlockContents(text) {
-	return text.replace(/\\(?:([stnr"'\\])|\n|\r\n?)/g, (_, escaped) => {
+/**
+* Escapes with no safe unescaped form (\b, \f and octal) are swapped for
+* private-use placeholders and restored verbatim by escapeDocForTextBlock.
+*/
+function unescapeTextBlockContents(text, preservedEscapes) {
+	return text.replace(/\\(?:([stnr"'\\])|([bf]|[0-3][0-7]{0,2}|[4-7][0-7]?)|\n|\r\n?)/g, (match, escaped, preserved) => {
+		if (preserved) {
+			preservedEscapes.push(match);
+			return String.fromCharCode(57344 + preservedEscapes.length - 1);
+		}
 		switch (escaped) {
 			case "s": return " ";
 			case "t": return "	";
@@ -698,6 +706,7 @@ function handleLineComment(commentNode, _, options) {
 		handleLabeledStatementComments,
 		handleLambdaExpressionComments,
 		handleMemberChainComments,
+		handleMethodHeaderComments,
 		handleModifiersComments,
 		handleNameComments,
 		handleTernaryExpressionComments,
@@ -799,6 +808,18 @@ function getMemberChainRoot(node) {
 	}
 	return current;
 }
+/**
+* With same-line braces, `{` follows the method header on the same line, so a
+* comment between the header and the block moves into the block.
+*/
+function handleMethodHeaderComments(commentNode, options) {
+	const { enclosingNode, followingNode } = commentNode;
+	if (options.braceStyle !== "same-line" || enclosingNode?.type !== "method_declaration" || followingNode?.type !== "block" || followingNode !== enclosingNode.bodyNode) return false;
+	const firstStatement = followingNode.namedChildren.at(0);
+	if (firstStatement) util.addLeadingComment(firstStatement, commentNode);
+	else util.addDanglingComment(followingNode, commentNode, void 0);
+	return true;
+}
 function handleModifiersComments(commentNode) {
 	const { precedingNode } = commentNode;
 	if (precedingNode?.type === "annotation" || precedingNode?.type === "marker_annotation" || precedingNode?.type === "modifiers") {
@@ -946,12 +967,15 @@ function printComments(path, doc) {
 var parser_default = {
 	async parse(text) {
 		const tree = (await parser).parse(text);
-		const { rootNode } = tree;
-		if (rootNode.hasError) throw new Error("Failed to parse: " + rootNode);
-		const ast = processTree(rootNode);
-		determinePrettierIgnoreRanges(ast);
-		tree.delete();
-		return ast;
+		try {
+			const { rootNode } = tree;
+			if (rootNode.hasError) throw new Error("Failed to parse: " + rootNode);
+			const ast = processTree(rootNode);
+			determinePrettierIgnoreRanges(ast);
+			return ast;
+		} finally {
+			tree.delete();
+		}
 	},
 	astFormat: "java",
 	hasPragma(text) {
@@ -1047,8 +1071,14 @@ var blocks_and_statements_default = {
 		return printBlock(path, printBlockStatements(path, print), options);
 	},
 	local_variable_declaration: printVariableDeclaration,
-	labeled_statement(path, print) {
-		return join$6(": ", path.map(print, "namedChildren"));
+	labeled_statement(path, print, options) {
+		const [label, statement] = path.map(print, "namedChildren");
+		return [
+			label,
+			":",
+			printStatementSeparator(path.node.namedChildren[1].type, options),
+			statement
+		];
 	},
 	expression_statement(path, print) {
 		const parentType = path.parent?.type;
@@ -1059,7 +1089,7 @@ var blocks_and_statements_default = {
 	if_statement(path, print, options) {
 		const statement = ["if ", path.call(print, "conditionNode")];
 		if (path.node.consequenceNode.type === ";") statement.push(";");
-		else statement.push(" ", path.call(print, "consequenceNode"));
+		else statement.push(printStatementSeparator(path.node.consequenceNode.type, options), path.call(print, "consequenceNode"));
 		if (!hasChild(path, "alternativeNode")) return statement;
 		const danglingComments = printDanglingComments(path);
 		if (danglingComments) statement.push(hardline$5, danglingComments, hardline$5);
@@ -1070,7 +1100,7 @@ var blocks_and_statements_default = {
 		}
 		statement.push("else");
 		if (path.node.alternativeNode.type === ";") statement.push(";");
-		else statement.push(" ", path.call(print, "alternativeNode"));
+		else statement.push(printStatementSeparator(path.node.alternativeNode.type, options), path.call(print, "alternativeNode"));
 		return statement;
 	},
 	assert_statement(path, print) {
@@ -1080,23 +1110,24 @@ var blocks_and_statements_default = {
 			";"
 		];
 	},
-	switch_expression(path, print) {
-		return join$6(" ", [
-			"switch",
+	switch_expression(path, print, options) {
+		return [
+			"switch ",
 			path.call(print, "conditionNode"),
+			printBlockSeparator(options),
 			path.call(print, "bodyNode")
-		]);
+		];
 	},
 	switch_block(path, print, options) {
 		return printBlock(path, path.map(print, "namedChildren"), options);
 	},
-	switch_block_statement_group(path, print) {
+	switch_block_statement_group(path, print, options) {
 		const parts = [];
 		path.each((child) => {
 			if (child.node.type === "switch_label") parts.push(print(child), ":");
 		}, "namedChildren");
 		const firstStatementIndex = path.node.namedChildren.findIndex(({ type }) => type !== "switch_label");
-		if (firstStatementIndex === path.node.namedChildren.length - 1 && path.node.namedChildren[firstStatementIndex].type === "block") parts.push(" ", path.call(print, "namedChildren", firstStatementIndex));
+		if (firstStatementIndex === path.node.namedChildren.length - 1 && path.node.namedChildren[firstStatementIndex].type === "block") parts.push(printBlockSeparator(options), path.call(print, "namedChildren", firstStatementIndex));
 		else if (firstStatementIndex !== -1) parts.push(indent$6([hardline$5, ...join$6(hardline$5, printBlockStatements(path, print))]));
 		return parts;
 	},
@@ -1111,22 +1142,22 @@ var blocks_and_statements_default = {
 		const guardIndex = path.node.namedChildren.findIndex(({ type }) => type === "guard");
 		return guardIndex !== -1 ? [group$6([...label, hasMultipleValues ? line$5 : " "]), path.call(print, "namedChildren", guardIndex)] : group$6(label);
 	},
-	switch_rule(path, print) {
+	switch_rule(path, print, options) {
 		const bodyIndex = path.node.namedChildren.findIndex(({ type }) => type === "block" || type === "expression_statement" || type === "throw_statement");
 		const body = path.call(print, "namedChildren", bodyIndex);
 		const switchLabelIndex = path.node.namedChildren.findIndex(({ type }) => type === "switch_label");
 		const parts = [path.call(print, "namedChildren", switchLabelIndex), " ->"];
 		const bodyNode = path.node.namedChildren[bodyIndex];
 		if (bodyNode.type !== "block" && hasLeadingComments(bodyNode)) parts.push(indent$6([hardline$5, body]));
-		else parts.push(" ", body);
+		else parts.push(printStatementSeparator(bodyNode.type, options), body);
 		return parts;
 	},
-	while_statement(path, print) {
+	while_statement(path, print, options) {
 		const parts = ["while ", path.call(print, "conditionNode")];
 		const body = path.call(print, "bodyNode");
 		const bodyType = path.node.bodyNode.type;
 		if (bodyType === "block") {
-			parts.push(" ", body);
+			parts.push(printBlockSeparator(options), body);
 			return parts;
 		} else if (bodyType === ";") {
 			parts.push(";");
@@ -1138,11 +1169,10 @@ var blocks_and_statements_default = {
 	},
 	do_statement(path, print, options) {
 		const hasEmptyStatement = path.node.bodyNode.type === ";";
-		const isNextLine = options?.braceStyle === "next-line";
-		const whilePrefix = isNextLine ? [hardline$5, "while "] : " while ";
+		const whilePrefix = options?.braceStyle === "next-line" ? [hardline$5, "while "] : " while ";
 		return [
 			"do",
-			hasEmptyStatement ? ";" : isNextLine ? path.call(print, "bodyNode") : [" ", path.call(print, "bodyNode")],
+			hasEmptyStatement ? ";" : [printStatementSeparator(path.node.bodyNode.type, options), path.call(print, "bodyNode")],
 			whilePrefix,
 			path.call(print, "conditionNode"),
 			";"
@@ -1163,18 +1193,18 @@ var blocks_and_statements_default = {
 			danglingComments && [danglingComments, hardline$5],
 			"for ",
 			hasInit || hasCondition || hasUpdate ? group$6(indentInParentheses([join$6(line$5, expressions.slice(0, 2)), expressions[2]], options)) : "(;;)",
-			hasEmptyStatement ? ";" : [" ", path.call(print, "bodyNode")]
+			hasEmptyStatement ? ";" : [printStatementSeparator(path.node.bodyNode.type, options), path.call(print, "bodyNode")]
 		];
 	},
 	update_expression(path, print) {
 		return path.map(print, "children");
 	},
-	enhanced_for_statement(path, print) {
+	enhanced_for_statement(path, print, options) {
 		const danglingComments = printDanglingComments(path);
 		const forStatement = [
 			danglingComments && [danglingComments, hardline$5],
 			"for (",
-			...printModifiers(path, print),
+			...printModifiers(path, print, "noBreak"),
 			path.call(print, "typeNode"),
 			" ",
 			path.call(print, "nameNode")
@@ -1185,7 +1215,7 @@ var blocks_and_statements_default = {
 		if (bodyType === ";") forStatement.push(";");
 		else {
 			const body = path.call(print, "bodyNode");
-			forStatement.push(bodyType === "block" ? [" ", body] : indent$6([line$5, body]));
+			forStatement.push(bodyType === "block" ? [printBlockSeparator(options), body] : indent$6([line$5, body]));
 		}
 		return group$6(forStatement);
 	},
@@ -1206,38 +1236,30 @@ var blocks_and_statements_default = {
 	},
 	return_statement: printReturnOrThrowStatement,
 	throw_statement: printReturnOrThrowStatement,
-	synchronized_statement(path, print) {
+	synchronized_statement(path, print, options) {
 		const parenthesizedExpressionIndex = path.node.namedChildren.findIndex(({ type }) => type === "parenthesized_expression");
 		return [
 			"synchronized ",
 			path.call(print, "namedChildren", parenthesizedExpressionIndex),
-			" ",
+			printBlockSeparator(options),
 			path.call(print, "bodyNode")
 		];
 	},
 	try_statement(path, print, options) {
-		const parts = ["try", path.call(print, "bodyNode")];
-		path.each((child) => {
-			if (child.node.type === "catch_clause" || child.node.type === "finally_clause") parts.push(print(child));
-		}, "namedChildren");
-		if (options?.braceStyle === "next-line") return parts;
-		return join$6(" ", parts);
+		return [
+			"try",
+			printBlockSeparator(options),
+			path.call(print, "bodyNode"),
+			...printCatchAndFinallyClauses(path, print, options)
+		];
 	},
 	catch_clause(path, print, options) {
 		const catchFormalParameterIndex = path.node.namedChildren.findIndex(({ type }) => type === "catch_formal_parameter");
-		const params = group$6(indentInParentheses(path.call(print, "namedChildren", catchFormalParameterIndex), options));
-		const body = path.call(print, "bodyNode");
-		if (options?.braceStyle === "next-line") return [
-			hardline$5,
-			"catch ",
-			params,
-			body
-		];
 		return [
 			"catch ",
-			params,
-			" ",
-			body
+			group$6(indentInParentheses(path.call(print, "namedChildren", catchFormalParameterIndex), options)),
+			printBlockSeparator(options),
+			path.call(print, "bodyNode")
 		];
 	},
 	catch_formal_parameter(path, print) {
@@ -1251,32 +1273,20 @@ var blocks_and_statements_default = {
 		return join$6([line$5, "| "], path.map(print, "namedChildren"));
 	},
 	finally_clause(path, print, options) {
-		if (options?.braceStyle === "next-line") return [
-			hardline$5,
+		return [
 			"finally",
+			printBlockSeparator(options),
 			path.call(print, "namedChildren", 0)
 		];
-		return ["finally ", path.call(print, "namedChildren", 0)];
 	},
 	try_with_resources_statement(path, print, options) {
-		const resources = path.call(print, "resourcesNode");
-		const body = path.call(print, "bodyNode");
-		const clauses = [];
-		path.each((child) => {
-			if (child.node.type === "catch_clause" || child.node.type === "finally_clause") clauses.push(print(child));
-		}, "namedChildren");
-		if (options?.braceStyle === "next-line") return [
+		return [
 			"try ",
-			resources,
-			body,
-			...clauses
+			path.call(print, "resourcesNode"),
+			printBlockSeparator(options),
+			path.call(print, "bodyNode"),
+			...printCatchAndFinallyClauses(path, print, options)
 		];
-		return join$6(" ", [
-			"try",
-			resources,
-			body,
-			...clauses
-		]);
 	},
 	resource_specification(path, print, options) {
 		const resources = [];
@@ -1293,7 +1303,7 @@ var blocks_and_statements_default = {
 	},
 	resource(path, print) {
 		if (hasChild(path, "typeNode") && hasChild(path, "nameNode") && hasChild(path, "valueNode")) {
-			const parts = printModifiers(path, print);
+			const parts = printModifiers(path, print, "noBreak");
 			parts.push(path.call(print, "typeNode"), " ", path.call(print, "nameNode"));
 			if (hasChild(path, "dimensionsNode")) parts.push(path.call(print, "dimensionsNode"));
 			parts.push(" =");
@@ -1344,6 +1354,16 @@ function printReturnOrThrowStatement(path, print, options) {
 		";"
 	];
 }
+function printStatementSeparator(statementType, options) {
+	return statementType === "block" ? printBlockSeparator(options) : " ";
+}
+function printCatchAndFinallyClauses(path, print, options) {
+	const clauses = [];
+	path.each((child) => {
+		if (child.node.type === "catch_clause" || child.node.type === "finally_clause") clauses.push(printBlockSeparator(options), print(child));
+	}, "namedChildren");
+	return clauses;
+}
 // src/printers/classes.ts
 const { group: group$5, hardline: hardline$4, indent: indent$5, join: join$5, line: line$4 } = builders;
 var classes_default = {
@@ -1357,21 +1377,21 @@ var classes_default = {
 		const hasMultipleClauses = definedClauses.length > 1;
 		if (hasChild(path, "type_parametersNode")) {
 			const typeParameters = path.call(print, "type_parametersNode");
-			parts.push(hasMultipleClauses ? group$5(indent$5(typeParameters)) : options?.braceStyle === "next-line" ? group$5(typeParameters) : typeParameters);
+			parts.push(hasMultipleClauses ? group$5(indent$5(typeParameters)) : group$5(typeParameters));
 		}
+		const separators = printDeclarationBodySeparators(definedClauses.length > 0, path.node.bodyNode.namedChildren.length > 0, options);
 		if (definedClauses.length) {
 			const clauses = definedClauses.flatMap((clause) => {
 				if (!hasChild(path, clause)) return [];
 				return [clause === "superclassNode" || clause === "interfacesNode" ? hardline$4 : line$4, path.call(print, clause)];
 			});
-			const hasBody = path.node.bodyNode.namedChildren.length > 0;
-			const afterClauses = options?.braceStyle === "next-line" ? "" : hasBody ? line$4 : " ";
-			const clauseGroup = [indent$5(clauses), afterClauses];
+			const clauseGroup = [indent$5(clauses), separators.afterClauses];
 			parts.push(hasMultipleClauses ? clauseGroup : group$5(clauseGroup));
-		} else if (options?.braceStyle !== "next-line") parts.push(" ");
+		}
 		return [
 			...printModifiers(path, print, "declarationOnly"),
 			group$5(parts),
+			separators.afterHeader,
 			path.call(print, "bodyNode")
 		];
 	},
@@ -1397,7 +1417,7 @@ var classes_default = {
 		if (hasChild(path, "dimensionsNode")) leftDoc.push(path.call(print, "dimensionsNode"));
 		return printAssignment(leftDoc, " =", hasChild(path, "valueNode") ? path.call(print, "valueNode") : void 0, path.node.valueNode);
 	},
-	method_declaration(path, print) {
+	method_declaration(path, print, options) {
 		const modifiers = printModifiers(path, print);
 		const declaration = [];
 		if (hasChild(path, "type_parametersNode")) declaration.push(group$5(path.call(print, "type_parametersNode")), " ");
@@ -1412,7 +1432,7 @@ var classes_default = {
 		return hasChild(path, "bodyNode") ? [
 			modifiers,
 			group$5(declaration),
-			" ",
+			printBlockSeparator(options),
 			path.call(print, "bodyNode")
 		] : [
 			modifiers,
@@ -1450,10 +1470,14 @@ var classes_default = {
 		const exceptions = path.map(print, "namedChildren");
 		return exceptions.length === 1 ? ["throws ", exceptions[0]] : ["throws", group$5(indent$5([line$4, ...join$5([",", line$4], exceptions)]))];
 	},
-	static_initializer(path, print) {
-		return ["static ", path.call(print, "namedChildren", 0)];
+	static_initializer(path, print, options) {
+		return [
+			"static",
+			printBlockSeparator(options),
+			path.call(print, "namedChildren", 0)
+		];
 	},
-	constructor_declaration(path, print) {
+	constructor_declaration(path, print, options) {
 		const modifiers = printModifiers(path, print, "declarationOnly");
 		const declaration = [];
 		if (hasChild(path, "type_parametersNode")) declaration.push(group$5(path.call(print, "type_parametersNode")), " ");
@@ -1463,7 +1487,7 @@ var classes_default = {
 		return [
 			modifiers,
 			group$5(declaration),
-			" ",
+			printBlockSeparator(options),
 			path.call(print, "bodyNode")
 		];
 	},
@@ -1503,13 +1527,13 @@ var classes_default = {
 	enum_declaration(path, print, options) {
 		const modifiers = printModifiers(path, print, "declarationOnly");
 		const parts = ["enum ", path.call(print, "nameNode")];
-		if (hasChild(path, "interfacesNode")) {
-			const hasBody = path.node.bodyNode.namedChildren.length > 0;
-			parts.push(indent$5([hardline$4, path.call(print, "interfacesNode")]), options?.braceStyle === "next-line" ? "" : hasBody ? line$4 : " ");
-		} else parts.push(" ");
+		const hasInterfaces = hasChild(path, "interfacesNode");
+		const separators = printDeclarationBodySeparators(hasInterfaces, path.node.bodyNode.namedChildren.length > 0, options);
+		if (hasInterfaces) parts.push(indent$5([hardline$4, path.call(print, "interfacesNode")]), separators.afterClauses);
 		return [
 			...modifiers,
 			group$5(parts),
+			separators.afterHeader,
 			path.call(print, "bodyNode")
 		];
 	},
@@ -1533,35 +1557,37 @@ var classes_default = {
 		if (declarations.length) contents.push(";", hardline$4, ...declarations);
 		return printBlock(path, contents.length ? [contents] : [], options);
 	},
-	enum_constant(path, print) {
+	enum_constant(path, print, options) {
 		const initializer = printModifiers(path, print);
 		initializer.push(path.call(print, "nameNode"));
 		if (hasChild(path, "argumentsNode")) initializer.push(path.call(print, "argumentsNode"));
-		if (hasChild(path, "bodyNode")) initializer.push(" ", path.call(print, "bodyNode"));
+		if (hasChild(path, "bodyNode")) initializer.push(printBlockSeparator(options), path.call(print, "bodyNode"));
 		return initializer;
 	},
 	enum_body_declarations(path, print) {
 		return join$5(hardline$4, printBodyDeclarations(path, print));
 	},
-	record_declaration(path, print) {
+	record_declaration(path, print, options) {
 		const modifiers = printModifiers(path, print, "declarationOnly");
 		const parts = ["record ", path.call(print, "nameNode")];
 		if (hasChild(path, "type_parametersNode")) parts.push(group$5(path.call(print, "type_parametersNode")));
 		parts.push(group$5(path.call(print, "parametersNode")));
-		if (hasChild(path, "interfacesNode")) {
-			const hasBody = path.node.bodyNode.namedChildren.length > 0;
+		const hasInterfaces = hasChild(path, "interfacesNode");
+		const separators = printDeclarationBodySeparators(hasInterfaces, path.node.bodyNode.namedChildren.length > 0, options);
+		if (hasInterfaces) {
 			const interfaces = [hardline$4, path.call(print, "interfacesNode")];
-			parts.push(group$5([indent$5(interfaces), hasBody ? line$4 : " "]));
-		} else parts.push(" ");
+			parts.push(group$5([indent$5(interfaces), separators.afterClauses]));
+		}
 		return [
 			...modifiers,
 			group$5(parts),
+			separators.afterHeader,
 			path.call(print, "bodyNode")
 		];
 	},
-	compact_constructor_declaration(path, print) {
+	compact_constructor_declaration(path, print, options) {
 		const parts = printModifiers(path, print, "declarationOnly");
-		parts.push(path.call(print, "nameNode"), " ", path.call(print, "bodyNode"));
+		parts.push(path.call(print, "nameNode"), printBlockSeparator(options), path.call(print, "bodyNode"));
 		return parts;
 	}
 };
@@ -1612,6 +1638,7 @@ var expressions_default = {
 		bodyDoc = printArrowFunctionBody(path, args, options, {
 			bodyDoc,
 			bodyComments,
+			bodySeparator: functionBody.type === "block" ? printBlockSeparator(options) : " ",
 			shouldPutBodyOnSameLine
 		});
 		return group$4([
@@ -1678,7 +1705,7 @@ var expressions_default = {
 		const breakClosingParen = parent.type === "explicit_constructor_invocation" || parent.type === "field_access" || parent.type === "method_invocation" || parent.type === "method_reference" || parent.type === "object_creation_expression";
 		const shouldExtraIndent = shouldExtraIndentForTernaryExpression(path);
 		const result = maybeGroup([
-			printTernaryTest(path, print),
+			printTernaryTest(path, print, operatorAtEnd),
 			forceNoIndent && !operatorAtEnd ? parts : indent$4(parts),
 			breakClosingParen && !shouldExtraIndent ? closingBracketLine(options) : ""
 		]);
@@ -1746,7 +1773,7 @@ var expressions_default = {
 			")"
 		]);
 	},
-	cast_expression(path, print) {
+	cast_expression(path, print, options) {
 		const { node } = path;
 		const parts = [
 			group$4(node.typeNodes.length === 1 ? [
@@ -1756,20 +1783,20 @@ var expressions_default = {
 			] : [
 				"(",
 				indent$4([softline$1, join$4([" &", line$3], path.map(print, "typeNodes"))]),
-				softline$1,
+				closingBracketLine(options),
 				")"
 			]),
 			" ",
 			path.call(print, "valueNode")
 		];
 		const parent = path.parent;
-		if (parent?.type === "unary_expression" && !node.comments || parent?.type === "array_access" && parent.arrayNode === node || (parent?.type === "explicit_constructor_invocation" || parent?.type === "field_access" || parent?.type === "method_invocation") && parent.objectNode === node || parent?.type === "method_reference" || parent?.type === "object_creation_expression") return group$4([indent$4([softline$1, ...parts]), softline$1]);
+		if (parent?.type === "unary_expression" && !node.comments || parent?.type === "array_access" && parent.arrayNode === node || (parent?.type === "explicit_constructor_invocation" || parent?.type === "field_access" || parent?.type === "method_invocation") && parent.objectNode === node || parent?.type === "method_reference" || parent?.type === "object_creation_expression") return group$4([indent$4([softline$1, ...parts]), closingBracketLine(options)]);
 		return parts;
 	},
-	object_creation_expression(path, print) {
+	object_creation_expression(path, print, options) {
 		const expression = [];
 		path.each((child) => {
-			if (child.node.type === "class_body") expression.push(" ");
+			if (child.node.type === "class_body") expression.push(printBlockSeparator(options));
 			expression.push(print(child));
 			if (child.node.type === "annotation" || child.node.type === "marker_annotation" || child.node.type === "new") expression.push(" ");
 		}, "children");
@@ -1929,11 +1956,11 @@ var expressions_default = {
 	record_pattern_component(path, print) {
 		return join$4(" ", path.map(print, "children"));
 	},
-	guard(path, print) {
+	guard(path, print, options) {
 		return ["when ", group$4([
 			ifBreak("("),
 			indent$4([softline$1, path.call(print, "namedChildren", 0)]),
-			softline$1,
+			closingBracketLine(options),
 			ifBreak(")")
 		])];
 	}
@@ -1976,10 +2003,10 @@ function printArrowFunctionSignatures(path, { signatureDocs }) {
 	if (node.fieldName === "object" && parent?.type === "method_invocation") return group$4(join$4([" ->", line$3], signatureDocs));
 	return group$4(indent$4(join$4([" ->", line$3], signatureDocs)));
 }
-function printArrowFunctionBody(path, args, options, { bodyDoc, bodyComments, shouldPutBodyOnSameLine }) {
+function printArrowFunctionBody(path, args, options, { bodyDoc, bodyComments, bodySeparator, shouldPutBodyOnSameLine }) {
 	const trailingSpace = args && typeof args === "object" && "expandLastArg" in args && args.expandLastArg && !path.node.comments ? closingBracketLine(options) : "";
 	return shouldPutBodyOnSameLine ? [
-		" ",
+		bodySeparator,
 		bodyDoc,
 		bodyComments
 	] : [indent$4([
@@ -2285,7 +2312,7 @@ function isHopefullyShortCallArgument(node) {
 	if (node.type === "binary_expression") return isSimpleCallArgument(node.leftNode, 1) && isSimpleCallArgument(node.rightNode, 1);
 	return isSimpleCallArgument(node);
 }
-function printTernaryTest(path, print) {
+function printTernaryTest(path, print, operatorAtEnd) {
 	const { node, parent } = path;
 	const printed = path.call(print, "conditionNode");
 	/**
@@ -2297,8 +2324,10 @@ function printTernaryTest(path, print) {
 	*       ^^ align(2)
 	*       ? d
 	*       : e
+	*
+	* With operators at the end there is no `: ` prefix to align under.
 	*/
-	if (parent?.type === node.type && parent.alternativeNode === node) return align(2, printed);
+	if (!operatorAtEnd && parent?.type === node.type && parent.alternativeNode === node) return align(2, printed);
 	return printed;
 }
 function getExpressionChild(node) {
@@ -2331,7 +2360,7 @@ function shouldExtraIndentForTernaryExpression(path) {
 	return getExpressionChild(parent) === child;
 }
 function isStringLiteral(node) {
-	return node.type === "string_literal" && node.children[0].value === "\"";
+	return node.type === "string_literal" && !isTextBlock(node);
 }
 var ArgExpansionBailout = class extends Error {
 	constructor(..._args) {
@@ -2350,19 +2379,20 @@ var interfaces_default = {
 		const hasMultipleClauses = hasExtendsInterfaces && hasPermits;
 		if (hasChild(path, "type_parametersNode")) {
 			const typeParameters = path.call(print, "type_parametersNode");
-			parts.push(hasMultipleClauses ? group$3(indent$3(typeParameters)) : options?.braceStyle === "next-line" ? group$3(typeParameters) : typeParameters);
+			parts.push(hasMultipleClauses ? group$3(indent$3(typeParameters)) : group$3(typeParameters));
 		}
+		const separators = printDeclarationBodySeparators(hasExtendsInterfaces || hasPermits, path.node.bodyNode.namedChildren.length > 0, options);
 		if (hasExtendsInterfaces || hasPermits) {
 			const clauses = [];
 			if (hasExtendsInterfaces) clauses.push(hardline$2, path.call(print, "namedChildren", extendsInterfacesIndex));
 			if (hasPermits) clauses.push(line$2, path.call(print, "permitsNode"));
-			const hasBody = path.node.bodyNode.namedChildren.length > 0;
-			const clauseGroup = [indent$3(clauses), options?.braceStyle === "next-line" ? "" : hasBody ? line$2 : " "];
+			const clauseGroup = [indent$3(clauses), separators.afterClauses];
 			parts.push(hasMultipleClauses ? clauseGroup : group$3(clauseGroup));
-		} else parts.push(" ");
+		}
 		return [
 			...printModifiers(path, print, "declarationOnly"),
 			group$3(parts),
+			separators.afterHeader,
 			path.call(print, "bodyNode")
 		];
 	},
@@ -2374,9 +2404,9 @@ var interfaces_default = {
 		return printBlock(path, printBodyDeclarations(path, print), options);
 	},
 	constant_declaration: printVariableDeclaration,
-	annotation_type_declaration(path, print) {
+	annotation_type_declaration(path, print, options) {
 		const parts = printModifiers(path, print);
-		parts.push("@interface ", path.call(print, "nameNode"), " ", path.call(print, "bodyNode"));
+		parts.push("@interface ", path.call(print, "nameNode"), printBlockSeparator(options), path.call(print, "bodyNode"));
 		return parts;
 	},
 	annotation_type_body(path, print, options) {
@@ -2421,7 +2451,7 @@ var interfaces_default = {
 const { group: group$2, hardline: hardline$1, indent: indent$2, join: join$2, softline } = builders;
 var lexical_structure_default = {
 	string_literal(path, print) {
-		if (path.node.namedChildren.some(({ type }) => type === "string_interpolation") || path.node.children[0].value === "\"") return path.map(print, "children");
+		if (path.node.namedChildren.some(({ type }) => type === "string_interpolation") || !isTextBlock(path.node)) return path.map(print, "children");
 		return printTextBlock(join$2(hardline$1, textBlockContents(path.node).split("\n")));
 	},
 	string_fragment: printValue,
@@ -2526,14 +2556,18 @@ var packages_and_modules_default = {
 		declaration.push(";");
 		return declaration;
 	},
-	module_declaration(path, print) {
+	module_declaration(path, print, options) {
 		const parts = [];
 		path.each((child) => {
 			if (child.node.type === "annotation" || child.node.type === "marker_annotation") parts.push(print(child));
 		}, "namedChildren");
 		if (path.node.children.some(({ type }) => type === "open")) parts.push("open");
-		parts.push("module", path.call(print, "nameNode"), path.call(print, "bodyNode"));
-		return join$1(" ", parts);
+		parts.push("module", path.call(print, "nameNode"));
+		return [
+			join$1(" ", parts),
+			printBlockSeparator(options),
+			path.call(print, "bodyNode")
+		];
 	},
 	module_body(path, print, options) {
 		return printBlock(path, path.map((child) => child.previous && child.node.start.row > child.previous.end.row + 1 ? [hardline, print(child)] : print(child), "namedChildren"), options);
@@ -2583,7 +2617,12 @@ function groupImports(imports, importOrder) {
 	for (const entry of imports) {
 		const key = importKey(entry);
 		const prefix = prefixes.filter((candidate) => key.startsWith(candidate)).reduce((best, candidate) => candidate.length > best.length ? candidate : best);
-		importsByPrefix.set(prefix, [...importsByPrefix.get(prefix) ?? [], {
+		const bucket = importsByPrefix.get(prefix);
+		if (bucket) bucket.push({
+			key,
+			entry
+		});
+		else importsByPrefix.set(prefix, [{
 			key,
 			entry
 		}]);