prettier-java-next-line 2.11.0 → 2.11.1

package/README.md

@@ -35,6 +35,24 @@ Set `braceStyle` only when a project needs the inherited same-line style:
 }
 ```
 
+With next-line braces, array initializers put every element on its own line by default. Set `arrayInitializerLayout` to `fit` to keep an array initializer on one line when it fits, and break it into the next-line layout only when it doesn't. When it fits, `bracketSpacing` decides whether to print `{ 1, 2 }` or `{1, 2}`.
+
+```json
+{
+	"plugins": ["prettier-java-next-line"],
+	"arrayInitializerLayout": "fit"
+}
+```
+
+Set `closingBracket` to `same-line` to keep the closing `)` or `>` of a wrapped list on its last line instead of on its own line. This matches Checkstyle's `SeparatorWrap` check on `RPAREN` with the `eol` option:
+
+```json
+{
+	"plugins": ["prettier-java-next-line"],
+	"closingBracket": "same-line"
+}
+```
+
 Set `importOrder` to group imports the way Spotless's `importOrder` step does. Groups separated by `,` get blank lines between them, prefixes joined by `|` share a group, `#` marks a static prefix, and an empty prefix catches everything else. Each import belongs to its longest matching prefix. Module imports (`import module`) always come first in their own group. When `importOrder` is empty, static imports follow them, then all others.
 
 ```json

package/dist/index.cjs

@@ -62,6 +62,32 @@ var options_default = {
 		}],
 		description: "Placement of opening braces."
 	},
+	arrayInitializerLayout: {
+		type: "choice",
+		category: "Java",
+		default: "always-break",
+		choices: [{
+			value: "always-break",
+			description: "Put each array element on its own line"
+		}, {
+			value: "fit",
+			description: "Keep array initializers on one line when they fit"
+		}],
+		description: "Layout of array initializers when braceStyle is next-line."
+	},
+	closingBracket: {
+		type: "choice",
+		category: "Java",
+		default: "next-line",
+		choices: [{
+			value: "next-line",
+			description: "Put the closing parenthesis or angle bracket of a wrapped list on its own line"
+		}, {
+			value: "same-line",
+			description: "Keep the closing parenthesis or angle bracket on the last line of a wrapped list"
+		}],
+		description: "Placement of the closing parenthesis or angle bracket when a list wraps."
+	},
 	importOrder: {
 		type: "string",
 		category: "Java",
@@ -134,11 +160,14 @@ function hasLeadingComments(node) {
 function hasDanglingComments(node) {
 	return node.comments?.some(({ leading, trailing }) => !leading && !trailing) ?? false;
 }
-function indentInParentheses(contents) {
+function closingBracketLine(options, lineDoc = softline$4) {
+	return options?.closingBracket === "same-line" ? "" : lineDoc;
+}
+function indentInParentheses(contents, options) {
 	return contents && !Array.isArray(contents) || contents.length ? [
 		"(",
 		indent$7([softline$4, contents]),
-		softline$4,
+		closingBracketLine(options),
 		")"
 	] : "()";
 }
@@ -157,6 +186,16 @@ function printArrayInitializer(path, print, options) {
 	const list = join$7([",", line$7], path.map(print, "namedChildren"));
 	if (list.length && options.trailingComma !== "none") list.push(ifBreak$2(","));
 	if (options.braceStyle === "next-line" && path.node.type === "array_initializer") {
+		if (options.arrayInitializerLayout === "fit") {
+			const bracketLine = options.bracketSpacing ? line$7 : softline$4;
+			const block = [
+				"{",
+				indent$7([bracketLine, ...list]),
+				bracketLine,
+				"}"
+			];
+			return group$7(isNestedArray(path) ? block : [softline$4, ...block]);
+		}
 		const block = [
 			"{",
 			indent$7([line$7, ...list]),
@@ -219,12 +258,18 @@ function printBlock(path, contents, options) {
 }
 function printBlockNextLine(path, contents) {
 	const parentType = path.parent?.type;
-	const prefix = parentType != null && [
+	const isChildOfBodyDeclaration = parentType != null && [
 		"annotation_type_body",
 		"class_body",
 		"enum_body",
 		"interface_body"
-	].includes(parentType) ? [] : [hardline$7];
+	].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,
 		"{",
@@ -275,7 +320,7 @@ function printBodyDeclarations(path, print, padFirst = false) {
 		return blankLine ? [separator, declaration] : declaration;
 	}, "namedChildren");
 }
-function printTypeParameters(path, print) {
+function printTypeParameters(path, print, options) {
 	const parameters = path.node.namedChildren;
 	if (parameters.length === 0 || parameters.length === 1 && isSimpleType(parameters[0]) && !parameters.some(({ comments }) => comments?.length && comments.some(({ type }) => type === "line_comment"))) return [
 		"<",
@@ -285,7 +330,7 @@ function printTypeParameters(path, print) {
 	const parts = [
 		"<",
 		indent$7([softline$4, join$7([",", line$7], path.map(print, "namedChildren"))]),
-		softline$4,
+		closingBracketLine(options),
 		">"
 	];
 	return path.node.type === "type_arguments" ? group$7(parts) : parts;
@@ -634,7 +679,7 @@ var blocks_and_statements_default = {
 			";"
 		];
 	},
-	for_statement(path, print) {
+	for_statement(path, print, options) {
 		const danglingComments = printDanglingComments(path);
 		const hasInit = path.node.initNodes.length > 0;
 		const hasCondition = hasChild(path, "conditionNode");
@@ -642,13 +687,13 @@ var blocks_and_statements_default = {
 		const expressions = [
 			!hasInit ? ";" : path.node.initNodes[0].type === "local_variable_declaration" ? path.call(print, "initNodes", 0) : [printExpressionList(path.map(print, "initNodes")), ";"],
 			hasCondition ? [path.call(print, "conditionNode"), ";"] : ";",
-			hasUpdate ? printExpressionList(path.map(print, "updateNodes")) : ""
+			hasUpdate ? [line$6, printExpressionList(path.map(print, "updateNodes"))] : ifBreak$1("", " ")
 		];
 		const hasEmptyStatement = path.node.bodyNode.type === ";";
 		return [
 			danglingComments && [danglingComments, hardline$6],
 			"for ",
-			hasInit || hasCondition || hasUpdate ? group$6(indentInParentheses(join$6(line$6, expressions))) : "(;;)",
+			hasInit || hasCondition || hasUpdate ? group$6(indentInParentheses([join$6(line$6, expressions.slice(0, 2)), expressions[2]], options)) : "(;;)",
 			hasEmptyStatement ? ";" : [" ", path.call(print, "bodyNode")]
 		];
 	},
@@ -711,7 +756,7 @@ var blocks_and_statements_default = {
 	},
 	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)));
+		const params = group$6(indentInParentheses(path.call(print, "namedChildren", catchFormalParameterIndex), options));
 		const body = path.call(print, "bodyNode");
 		if (options?.braceStyle === "next-line") return [
 			hardline$6,
@@ -764,7 +809,7 @@ var blocks_and_statements_default = {
 			...clauses
 		]);
 	},
-	resource_specification(path, print) {
+	resource_specification(path, print, options) {
 		const resources = [];
 		let hasTrailingSemicolon = false;
 		path.each((child) => {
@@ -775,7 +820,7 @@ var blocks_and_statements_default = {
 		}, "children");
 		const parts = join$6([";", line$6], resources);
 		if (hasTrailingSemicolon) parts.push(ifBreak$1(";"));
-		return group$6(indentInParentheses(parts));
+		return group$6(indentInParentheses(parts, options));
 	},
 	resource(path, print) {
 		if (hasChild(path, "typeNode") && hasChild(path, "nameNode") && hasChild(path, "valueNode")) {
@@ -805,28 +850,28 @@ var blocks_and_statements_default = {
 function printExpressionList(expressions) {
 	return group$6(expressions.map((expression, index) => index === 0 ? expression : [",", indent$6([line$6, expression])]));
 }
-function printReturnOrThrowArgument(path, print) {
+function printReturnOrThrowArgument(path, print, options) {
 	const { node } = path;
 	const argumentDoc = print(path);
 	if (returnArgumentHasLeadingComment(node)) return [
 		"(",
 		indent$6([hardline$6, argumentDoc]),
-		hardline$6,
+		closingBracketLine(options, hardline$6),
 		")"
 	];
 	if (node.type === "binary_expression") return group$6([
 		ifBreak$1("("),
 		indent$6([softline$3, argumentDoc]),
-		softline$3,
+		closingBracketLine(options),
 		ifBreak$1(")")
 	]);
 	return argumentDoc;
 }
-function printReturnOrThrowStatement(path, print) {
+function printReturnOrThrowStatement(path, print, options) {
 	const { node } = path;
 	return [
 		node.type === "throw_statement" ? "throw" : "return",
-		node.namedChildren.length ? [" ", path.call(() => printReturnOrThrowArgument(path, print), "namedChildren", 0)] : "",
+		node.namedChildren.length ? [" ", path.call(() => printReturnOrThrowArgument(path, print, options), "namedChildren", 0)] : "",
 		";"
 	];
 }
@@ -844,7 +889,7 @@ 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)) : typeParameters);
+			parts.push(hasMultipleClauses ? group$5(indent$5(typeParameters)) : options?.braceStyle === "next-line" ? group$5(typeParameters) : typeParameters);
 		}
 		if (definedClauses.length) {
 			const clauses = definedClauses.flatMap((clause) => {
@@ -910,14 +955,14 @@ var classes_default = {
 	receiver_parameter(path, print) {
 		return path.map((child) => child.isLast ? print(child) : [print(child), child.node.type === "identifier" ? "." : " "], "namedChildren");
 	},
-	formal_parameters(path, print) {
+	formal_parameters(path, print, options) {
 		const parameters = path.parent?.type === "record_declaration" ? printBodyDeclarations(path, print) : path.map(print, "namedChildren");
 		if (parameters.length === 0) return [
 			"(",
 			printDanglingCommentsInList(path),
 			")"
 		];
-		return indentInParentheses(join$5([",", line$5], parameters));
+		return indentInParentheses(join$5([",", line$5], parameters), options);
 	},
 	formal_parameter(path, print) {
 		const parameter = printModifiers(path, print, path.grandparent?.type === "record_declaration" ? "avoidBreak" : "noBreak");
@@ -986,12 +1031,12 @@ var classes_default = {
 		if (modifiers.length || typeAnnotations.length) parts.push(join$5(" ", [...modifiers, ...typeAnnotations]));
 		return join$5(annotationMode === "avoidBreak" ? line$5 : annotationMode === "noBreak" ? " " : hardline$5, parts);
 	},
-	enum_declaration(path, print) {
+	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$5, path.call(print, "interfacesNode")]), hasBody ? line$5 : " ");
+			parts.push(indent$5([hardline$5, path.call(print, "interfacesNode")]), options?.braceStyle === "next-line" ? "" : hasBody ? line$5 : " ");
 		} else parts.push(" ");
 		return [
 			...modifiers,
@@ -1100,7 +1145,7 @@ var expressions_default = {
 		const shouldPutBodyOnSameLine = !functionBody.comments?.some((comment) => comment.leading && hasNewline$1(options.originalText, comment.end.index)) && mayBreakAfterShortPrefix(functionBody);
 		const chainGroupId = Symbol("arrow-chain");
 		const signaturesDoc = printArrowFunctionSignatures(path, { signatureDocs });
-		bodyDoc = printArrowFunctionBody(path, args, {
+		bodyDoc = printArrowFunctionBody(path, args, options, {
 			bodyDoc,
 			bodyComments,
 			shouldPutBodyOnSameLine
@@ -1118,7 +1163,7 @@ var expressions_default = {
 		}, "namedChildren");
 		if (!identifiers.length) return "()";
 		const parameters = join$4([",", line$4], identifiers);
-		if (identifiers.length > 1 || willBreak(identifiers)) return group$4(indentInParentheses(parameters));
+		if (identifiers.length > 1 || willBreak(identifiers)) return group$4(indentInParentheses(parameters, options));
 		return options.arrowParens === "avoid" ? parameters : [
 			"(",
 			...parameters,
@@ -1159,9 +1204,9 @@ var expressions_default = {
 		const result = maybeGroup([
 			printTernaryTest(path, print),
 			forceNoIndent ? parts : indent$4(parts),
-			breakClosingParen && !shouldExtraIndent ? softline$1 : ""
+			breakClosingParen && !shouldExtraIndent ? closingBracketLine(options) : ""
 		]);
-		return isParentTest || shouldExtraIndent ? group$4([indent$4([softline$1, result]), softline$1]) : result;
+		return isParentTest || shouldExtraIndent ? group$4([indent$4([softline$1, result]), closingBracketLine(options)]) : result;
 	},
 	assignment_expression(path, print) {
 		const { node } = path;
@@ -1174,7 +1219,7 @@ var expressions_default = {
 		const isInsideParentheses = (grandparent?.type === "if_statement" || grandparent?.type === "while_statement" || grandparent?.type === "switch_expression" || grandparent?.type === "do_statement") && grandparent.conditionNode === parent || grandparent?.type === "synchronized_statement" && grandparent.bodyNode !== parent;
 		const parts = printBinaryExpressions(path, print, options, isInsideParentheses);
 		if (isInsideParentheses) return parts;
-		if (parent?.type === "unary_expression" && !node.comments || (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 === "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)]);
 		if (isReturnOrThrowStatement(parent) || parent?.type === "assignment_expression" || parent?.type === "variable_declarator" || parent?.type === "guard" || parent?.type === "lambda_expression" && parent.bodyNode === node || parent?.type === "for_statement" && parent.conditionNode === node || parent?.type === "ternary_expression" && !isReturnOrThrowStatement(grandparent) && grandparent?.type !== "parenthesized_expression" && grandparent?.type !== "argument_list" || parent?.type === "unary_expression" && parent.operandNode === node) return group$4(parts);
 		if (parts.length === 0) return "";
 		const firstGroupIndex = parts.findIndex((part) => typeof part !== "string" && !Array.isArray(part) && part.type === "group");
@@ -1189,10 +1234,10 @@ var expressions_default = {
 			return [(options.experimentalOperatorPosition === "start" ? child.node.type === "instanceof" : child.previous.type === "instanceof") ? line$4 : " ", doc];
 		}, "children")));
 	},
-	unary_expression(path, print) {
+	unary_expression(path, print, options) {
 		const parts = [path.call(print, "operatorNode")];
 		const operandDoc = path.call(print, "operandNode");
-		if (path.node.operandNode.comments) parts.push(group$4(indentInParentheses(operandDoc)));
+		if (path.node.operandNode.comments) parts.push(group$4(indentInParentheses(operandDoc, options)));
 		else parts.push(operandDoc);
 		return parts;
 	},
@@ -1202,7 +1247,7 @@ var expressions_default = {
 		const typeArgumentsIndex = path.node.namedChildren.findIndex(({ type }) => type === "type_arguments");
 		return [path.call(print, "namedChildren", typeIdentifierIndex), path.call(print, "namedChildren", typeArgumentsIndex)];
 	},
-	parenthesized_expression(path, print) {
+	parenthesized_expression(path, print, options) {
 		const expression = path.call(print, "namedChildren", 0);
 		const parentType = path.parent?.type;
 		const grandparentType = path.grandparent?.type;
@@ -1211,12 +1256,12 @@ var expressions_default = {
 		const hasTernary = expressionType === "ternary_expression";
 		const hasSuffix = parentType && (parentType === "array_access" || parentType === "explicit_constructor_invocation" || parentType === "field_access" || parentType === "method_invocation" || parentType === "method_reference" || parentType === "object_creation_expression");
 		const isAssignment = parentType && (parentType === "assignment_expression" || parentType === "variable_declarator") || hasSuffix && (grandparentType === "assignment_expression" || grandparentType === "variable_declarator");
-		if (!hasLambda && hasSuffix && (!hasTernary || isAssignment)) return group$4(indentInParentheses(hasTernary ? group$4(expression) : expression));
-		else if (parentType && (parentType === "guard" || parentType === "return_statement" || parentType === "unary_expression" && grandparentType === "return_statement" || path.node.fieldName === "condition" && (parentType === "do_statement" || parentType === "if_statement" || parentType === "switch_expression" || parentType === "while_statement") || path.node.fieldName !== "body" && parentType === "synchronized_statement")) return group$4(indentInParentheses(group$4(expression)));
+		if (!hasLambda && hasSuffix && (!hasTernary || isAssignment)) return group$4(indentInParentheses(hasTernary ? group$4(expression) : expression, options));
+		else if (parentType && (parentType === "guard" || parentType === "return_statement" || parentType === "unary_expression" && grandparentType === "return_statement" || path.node.fieldName === "condition" && (parentType === "do_statement" || parentType === "if_statement" || parentType === "switch_expression" || parentType === "while_statement") || path.node.fieldName !== "body" && parentType === "synchronized_statement")) return group$4(indentInParentheses(group$4(expression), options));
 		else if (hasTernary && hasSuffix && !isAssignment) return group$4([
 			"(",
 			expression,
-			softline$1,
+			closingBracketLine(options),
 			")"
 		]);
 		else return group$4([
@@ -1259,7 +1304,7 @@ var expressions_default = {
 		const args = path.node.namedChildren;
 		if (args.length === 0) {
 			const shouldBreak = path.node.comments?.some(({ type, leading, trailing }) => !leading && !trailing && type === "line_comment");
-			return group$4(indentInParentheses(printDanglingComments(path)), { shouldBreak });
+			return group$4(indentInParentheses(printDanglingComments(path), options), { shouldBreak });
 		}
 		const lastArgIndex = args.length - 1;
 		let anyArgEmptyLine = false;
@@ -1285,7 +1330,7 @@ var expressions_default = {
 			return group$4([
 				"(",
 				indent$4([line$4, ...printedArguments]),
-				line$4,
+				closingBracketLine(options, line$4),
 				")"
 			], { shouldBreak: true });
 		}
@@ -1357,7 +1402,7 @@ var expressions_default = {
 				allArgsBrokenOut()
 			]);
 		}
-		return group$4(indentInParentheses(printedArguments), { shouldBreak: printedArguments.some(willBreak) || anyArgEmptyLine });
+		return group$4(indentInParentheses(printedArguments, options), { shouldBreak: printedArguments.some(willBreak) || anyArgEmptyLine });
 	},
 	array_creation_expression(path, print) {
 		const parts = ["new "];
@@ -1398,8 +1443,8 @@ var expressions_default = {
 	record_pattern(path, print) {
 		return path.map(print, "children");
 	},
-	record_pattern_body(path, print) {
-		return group$4(indentInParentheses(join$4([",", line$4], path.map(print, "namedChildren"))));
+	record_pattern_body(path, print, options) {
+		return group$4(indentInParentheses(join$4([",", line$4], path.map(print, "namedChildren")), options));
 	},
 	record_pattern_component(path, print) {
 		return join$4(" ", path.map(print, "children"));
@@ -1451,8 +1496,8 @@ function printArrowFunctionSignatures(path, { signatureDocs }) {
 	if (node.fieldName === "object" && parent?.type === "method_invocation") return group$4(join$4([" ->", line$4], signatureDocs));
 	return group$4(indent$4(join$4([" ->", line$4], signatureDocs)));
 }
-function printArrowFunctionBody(path, args, { bodyDoc, bodyComments, shouldPutBodyOnSameLine }) {
-	const trailingSpace = args && typeof args === "object" && "expandLastArg" in args && args.expandLastArg && !path.node.comments ? softline$1 : "";
+function printArrowFunctionBody(path, args, options, { bodyDoc, bodyComments, shouldPutBodyOnSameLine }) {
+	const trailingSpace = args && typeof args === "object" && "expandLastArg" in args && args.expandLastArg && !path.node.comments ? closingBracketLine(options) : "";
 	return shouldPutBodyOnSameLine ? [
 		" ",
 		bodyDoc,
@@ -1809,7 +1854,7 @@ 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)) : typeParameters);
+			parts.push(hasMultipleClauses ? group$3(indent$3(typeParameters)) : options?.braceStyle === "next-line" ? group$3(typeParameters) : typeParameters);
 		}
 		if (hasExtendsInterfaces || hasPermits) {
 			const clauses = [];
@@ -1859,13 +1904,13 @@ var interfaces_default = {
 	marker_annotation(path, print) {
 		return ["@", path.call(print, "nameNode")];
 	},
-	annotation_argument_list(path, print) {
+	annotation_argument_list(path, print, options) {
 		const args = path.map(print, "namedChildren");
 		return args.length === 1 && path.node.namedChildren[0].type === "element_value_array_initializer" ? [
 			"(",
 			args[0],
 			")"
-		] : group$3(indentInParentheses(join$3([",", line$3], args)));
+		] : group$3(indentInParentheses(join$3([",", line$3], args), options));
 	},
 	element_value_pair(path, print) {
 		return group$3([

package/dist/index.d.cts

@@ -1631,6 +1631,26 @@ declare const _default: {
       }[];
       description: string;
     };
+    arrayInitializerLayout: {
+      type: "choice";
+      category: string;
+      default: string;
+      choices: {
+        value: string;
+        description: string;
+      }[];
+      description: string;
+    };
+    closingBracket: {
+      type: "choice";
+      category: string;
+      default: string;
+      choices: {
+        value: string;
+        description: string;
+      }[];
+      description: string;
+    };
     importOrder: {
       type: "string";
       category: string;

package/dist/index.d.mts

@@ -1631,6 +1631,26 @@ declare const _default: {
       }[];
       description: string;
     };
+    arrayInitializerLayout: {
+      type: "choice";
+      category: string;
+      default: string;
+      choices: {
+        value: string;
+        description: string;
+      }[];
+      description: string;
+    };
+    closingBracket: {
+      type: "choice";
+      category: string;
+      default: string;
+      choices: {
+        value: string;
+        description: string;
+      }[];
+      description: string;
+    };
     importOrder: {
       type: "string";
       category: string;

package/dist/index.mjs

@@ -62,6 +62,32 @@ var options_default = {
 		}],
 		description: "Placement of opening braces."
 	},
+	arrayInitializerLayout: {
+		type: "choice",
+		category: "Java",
+		default: "always-break",
+		choices: [{
+			value: "always-break",
+			description: "Put each array element on its own line"
+		}, {
+			value: "fit",
+			description: "Keep array initializers on one line when they fit"
+		}],
+		description: "Layout of array initializers when braceStyle is next-line."
+	},
+	closingBracket: {
+		type: "choice",
+		category: "Java",
+		default: "next-line",
+		choices: [{
+			value: "next-line",
+			description: "Put the closing parenthesis or angle bracket of a wrapped list on its own line"
+		}, {
+			value: "same-line",
+			description: "Keep the closing parenthesis or angle bracket on the last line of a wrapped list"
+		}],
+		description: "Placement of the closing parenthesis or angle bracket when a list wraps."
+	},
 	importOrder: {
 		type: "string",
 		category: "Java",
@@ -134,11 +160,14 @@ function hasLeadingComments(node) {
 function hasDanglingComments(node) {
 	return node.comments?.some(({ leading, trailing }) => !leading && !trailing) ?? false;
 }
-function indentInParentheses(contents) {
+function closingBracketLine(options, lineDoc = softline$4) {
+	return options?.closingBracket === "same-line" ? "" : lineDoc;
+}
+function indentInParentheses(contents, options) {
 	return contents && !Array.isArray(contents) || contents.length ? [
 		"(",
 		indent$7([softline$4, contents]),
-		softline$4,
+		closingBracketLine(options),
 		")"
 	] : "()";
 }
@@ -157,6 +186,16 @@ function printArrayInitializer(path, print, options) {
 	const list = join$7([",", line$7], path.map(print, "namedChildren"));
 	if (list.length && options.trailingComma !== "none") list.push(ifBreak$2(","));
 	if (options.braceStyle === "next-line" && path.node.type === "array_initializer") {
+		if (options.arrayInitializerLayout === "fit") {
+			const bracketLine = options.bracketSpacing ? line$7 : softline$4;
+			const block = [
+				"{",
+				indent$7([bracketLine, ...list]),
+				bracketLine,
+				"}"
+			];
+			return group$7(isNestedArray(path) ? block : [softline$4, ...block]);
+		}
 		const block = [
 			"{",
 			indent$7([line$7, ...list]),
@@ -219,12 +258,18 @@ function printBlock(path, contents, options) {
 }
 function printBlockNextLine(path, contents) {
 	const parentType = path.parent?.type;
-	const prefix = parentType != null && [
+	const isChildOfBodyDeclaration = parentType != null && [
 		"annotation_type_body",
 		"class_body",
 		"enum_body",
 		"interface_body"
-	].includes(parentType) ? [] : [hardline$7];
+	].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,
 		"{",
@@ -275,7 +320,7 @@ function printBodyDeclarations(path, print, padFirst = false) {
 		return blankLine ? [separator, declaration] : declaration;
 	}, "namedChildren");
 }
-function printTypeParameters(path, print) {
+function printTypeParameters(path, print, options) {
 	const parameters = path.node.namedChildren;
 	if (parameters.length === 0 || parameters.length === 1 && isSimpleType(parameters[0]) && !parameters.some(({ comments }) => comments?.length && comments.some(({ type }) => type === "line_comment"))) return [
 		"<",
@@ -285,7 +330,7 @@ function printTypeParameters(path, print) {
 	const parts = [
 		"<",
 		indent$7([softline$4, join$7([",", line$7], path.map(print, "namedChildren"))]),
-		softline$4,
+		closingBracketLine(options),
 		">"
 	];
 	return path.node.type === "type_arguments" ? group$7(parts) : parts;
@@ -634,7 +679,7 @@ var blocks_and_statements_default = {
 			";"
 		];
 	},
-	for_statement(path, print) {
+	for_statement(path, print, options) {
 		const danglingComments = printDanglingComments(path);
 		const hasInit = path.node.initNodes.length > 0;
 		const hasCondition = hasChild(path, "conditionNode");
@@ -642,13 +687,13 @@ var blocks_and_statements_default = {
 		const expressions = [
 			!hasInit ? ";" : path.node.initNodes[0].type === "local_variable_declaration" ? path.call(print, "initNodes", 0) : [printExpressionList(path.map(print, "initNodes")), ";"],
 			hasCondition ? [path.call(print, "conditionNode"), ";"] : ";",
-			hasUpdate ? printExpressionList(path.map(print, "updateNodes")) : ""
+			hasUpdate ? [line$6, printExpressionList(path.map(print, "updateNodes"))] : ifBreak$1("", " ")
 		];
 		const hasEmptyStatement = path.node.bodyNode.type === ";";
 		return [
 			danglingComments && [danglingComments, hardline$6],
 			"for ",
-			hasInit || hasCondition || hasUpdate ? group$6(indentInParentheses(join$6(line$6, expressions))) : "(;;)",
+			hasInit || hasCondition || hasUpdate ? group$6(indentInParentheses([join$6(line$6, expressions.slice(0, 2)), expressions[2]], options)) : "(;;)",
 			hasEmptyStatement ? ";" : [" ", path.call(print, "bodyNode")]
 		];
 	},
@@ -711,7 +756,7 @@ var blocks_and_statements_default = {
 	},
 	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)));
+		const params = group$6(indentInParentheses(path.call(print, "namedChildren", catchFormalParameterIndex), options));
 		const body = path.call(print, "bodyNode");
 		if (options?.braceStyle === "next-line") return [
 			hardline$6,
@@ -764,7 +809,7 @@ var blocks_and_statements_default = {
 			...clauses
 		]);
 	},
-	resource_specification(path, print) {
+	resource_specification(path, print, options) {
 		const resources = [];
 		let hasTrailingSemicolon = false;
 		path.each((child) => {
@@ -775,7 +820,7 @@ var blocks_and_statements_default = {
 		}, "children");
 		const parts = join$6([";", line$6], resources);
 		if (hasTrailingSemicolon) parts.push(ifBreak$1(";"));
-		return group$6(indentInParentheses(parts));
+		return group$6(indentInParentheses(parts, options));
 	},
 	resource(path, print) {
 		if (hasChild(path, "typeNode") && hasChild(path, "nameNode") && hasChild(path, "valueNode")) {
@@ -805,28 +850,28 @@ var blocks_and_statements_default = {
 function printExpressionList(expressions) {
 	return group$6(expressions.map((expression, index) => index === 0 ? expression : [",", indent$6([line$6, expression])]));
 }
-function printReturnOrThrowArgument(path, print) {
+function printReturnOrThrowArgument(path, print, options) {
 	const { node } = path;
 	const argumentDoc = print(path);
 	if (returnArgumentHasLeadingComment(node)) return [
 		"(",
 		indent$6([hardline$6, argumentDoc]),
-		hardline$6,
+		closingBracketLine(options, hardline$6),
 		")"
 	];
 	if (node.type === "binary_expression") return group$6([
 		ifBreak$1("("),
 		indent$6([softline$3, argumentDoc]),
-		softline$3,
+		closingBracketLine(options),
 		ifBreak$1(")")
 	]);
 	return argumentDoc;
 }
-function printReturnOrThrowStatement(path, print) {
+function printReturnOrThrowStatement(path, print, options) {
 	const { node } = path;
 	return [
 		node.type === "throw_statement" ? "throw" : "return",
-		node.namedChildren.length ? [" ", path.call(() => printReturnOrThrowArgument(path, print), "namedChildren", 0)] : "",
+		node.namedChildren.length ? [" ", path.call(() => printReturnOrThrowArgument(path, print, options), "namedChildren", 0)] : "",
 		";"
 	];
 }
@@ -844,7 +889,7 @@ 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)) : typeParameters);
+			parts.push(hasMultipleClauses ? group$5(indent$5(typeParameters)) : options?.braceStyle === "next-line" ? group$5(typeParameters) : typeParameters);
 		}
 		if (definedClauses.length) {
 			const clauses = definedClauses.flatMap((clause) => {
@@ -910,14 +955,14 @@ var classes_default = {
 	receiver_parameter(path, print) {
 		return path.map((child) => child.isLast ? print(child) : [print(child), child.node.type === "identifier" ? "." : " "], "namedChildren");
 	},
-	formal_parameters(path, print) {
+	formal_parameters(path, print, options) {
 		const parameters = path.parent?.type === "record_declaration" ? printBodyDeclarations(path, print) : path.map(print, "namedChildren");
 		if (parameters.length === 0) return [
 			"(",
 			printDanglingCommentsInList(path),
 			")"
 		];
-		return indentInParentheses(join$5([",", line$5], parameters));
+		return indentInParentheses(join$5([",", line$5], parameters), options);
 	},
 	formal_parameter(path, print) {
 		const parameter = printModifiers(path, print, path.grandparent?.type === "record_declaration" ? "avoidBreak" : "noBreak");
@@ -986,12 +1031,12 @@ var classes_default = {
 		if (modifiers.length || typeAnnotations.length) parts.push(join$5(" ", [...modifiers, ...typeAnnotations]));
 		return join$5(annotationMode === "avoidBreak" ? line$5 : annotationMode === "noBreak" ? " " : hardline$5, parts);
 	},
-	enum_declaration(path, print) {
+	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$5, path.call(print, "interfacesNode")]), hasBody ? line$5 : " ");
+			parts.push(indent$5([hardline$5, path.call(print, "interfacesNode")]), options?.braceStyle === "next-line" ? "" : hasBody ? line$5 : " ");
 		} else parts.push(" ");
 		return [
 			...modifiers,
@@ -1100,7 +1145,7 @@ var expressions_default = {
 		const shouldPutBodyOnSameLine = !functionBody.comments?.some((comment) => comment.leading && hasNewline$1(options.originalText, comment.end.index)) && mayBreakAfterShortPrefix(functionBody);
 		const chainGroupId = Symbol("arrow-chain");
 		const signaturesDoc = printArrowFunctionSignatures(path, { signatureDocs });
-		bodyDoc = printArrowFunctionBody(path, args, {
+		bodyDoc = printArrowFunctionBody(path, args, options, {
 			bodyDoc,
 			bodyComments,
 			shouldPutBodyOnSameLine
@@ -1118,7 +1163,7 @@ var expressions_default = {
 		}, "namedChildren");
 		if (!identifiers.length) return "()";
 		const parameters = join$4([",", line$4], identifiers);
-		if (identifiers.length > 1 || willBreak(identifiers)) return group$4(indentInParentheses(parameters));
+		if (identifiers.length > 1 || willBreak(identifiers)) return group$4(indentInParentheses(parameters, options));
 		return options.arrowParens === "avoid" ? parameters : [
 			"(",
 			...parameters,
@@ -1159,9 +1204,9 @@ var expressions_default = {
 		const result = maybeGroup([
 			printTernaryTest(path, print),
 			forceNoIndent ? parts : indent$4(parts),
-			breakClosingParen && !shouldExtraIndent ? softline$1 : ""
+			breakClosingParen && !shouldExtraIndent ? closingBracketLine(options) : ""
 		]);
-		return isParentTest || shouldExtraIndent ? group$4([indent$4([softline$1, result]), softline$1]) : result;
+		return isParentTest || shouldExtraIndent ? group$4([indent$4([softline$1, result]), closingBracketLine(options)]) : result;
 	},
 	assignment_expression(path, print) {
 		const { node } = path;
@@ -1174,7 +1219,7 @@ var expressions_default = {
 		const isInsideParentheses = (grandparent?.type === "if_statement" || grandparent?.type === "while_statement" || grandparent?.type === "switch_expression" || grandparent?.type === "do_statement") && grandparent.conditionNode === parent || grandparent?.type === "synchronized_statement" && grandparent.bodyNode !== parent;
 		const parts = printBinaryExpressions(path, print, options, isInsideParentheses);
 		if (isInsideParentheses) return parts;
-		if (parent?.type === "unary_expression" && !node.comments || (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 === "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)]);
 		if (isReturnOrThrowStatement(parent) || parent?.type === "assignment_expression" || parent?.type === "variable_declarator" || parent?.type === "guard" || parent?.type === "lambda_expression" && parent.bodyNode === node || parent?.type === "for_statement" && parent.conditionNode === node || parent?.type === "ternary_expression" && !isReturnOrThrowStatement(grandparent) && grandparent?.type !== "parenthesized_expression" && grandparent?.type !== "argument_list" || parent?.type === "unary_expression" && parent.operandNode === node) return group$4(parts);
 		if (parts.length === 0) return "";
 		const firstGroupIndex = parts.findIndex((part) => typeof part !== "string" && !Array.isArray(part) && part.type === "group");
@@ -1189,10 +1234,10 @@ var expressions_default = {
 			return [(options.experimentalOperatorPosition === "start" ? child.node.type === "instanceof" : child.previous.type === "instanceof") ? line$4 : " ", doc];
 		}, "children")));
 	},
-	unary_expression(path, print) {
+	unary_expression(path, print, options) {
 		const parts = [path.call(print, "operatorNode")];
 		const operandDoc = path.call(print, "operandNode");
-		if (path.node.operandNode.comments) parts.push(group$4(indentInParentheses(operandDoc)));
+		if (path.node.operandNode.comments) parts.push(group$4(indentInParentheses(operandDoc, options)));
 		else parts.push(operandDoc);
 		return parts;
 	},
@@ -1202,7 +1247,7 @@ var expressions_default = {
 		const typeArgumentsIndex = path.node.namedChildren.findIndex(({ type }) => type === "type_arguments");
 		return [path.call(print, "namedChildren", typeIdentifierIndex), path.call(print, "namedChildren", typeArgumentsIndex)];
 	},
-	parenthesized_expression(path, print) {
+	parenthesized_expression(path, print, options) {
 		const expression = path.call(print, "namedChildren", 0);
 		const parentType = path.parent?.type;
 		const grandparentType = path.grandparent?.type;
@@ -1211,12 +1256,12 @@ var expressions_default = {
 		const hasTernary = expressionType === "ternary_expression";
 		const hasSuffix = parentType && (parentType === "array_access" || parentType === "explicit_constructor_invocation" || parentType === "field_access" || parentType === "method_invocation" || parentType === "method_reference" || parentType === "object_creation_expression");
 		const isAssignment = parentType && (parentType === "assignment_expression" || parentType === "variable_declarator") || hasSuffix && (grandparentType === "assignment_expression" || grandparentType === "variable_declarator");
-		if (!hasLambda && hasSuffix && (!hasTernary || isAssignment)) return group$4(indentInParentheses(hasTernary ? group$4(expression) : expression));
-		else if (parentType && (parentType === "guard" || parentType === "return_statement" || parentType === "unary_expression" && grandparentType === "return_statement" || path.node.fieldName === "condition" && (parentType === "do_statement" || parentType === "if_statement" || parentType === "switch_expression" || parentType === "while_statement") || path.node.fieldName !== "body" && parentType === "synchronized_statement")) return group$4(indentInParentheses(group$4(expression)));
+		if (!hasLambda && hasSuffix && (!hasTernary || isAssignment)) return group$4(indentInParentheses(hasTernary ? group$4(expression) : expression, options));
+		else if (parentType && (parentType === "guard" || parentType === "return_statement" || parentType === "unary_expression" && grandparentType === "return_statement" || path.node.fieldName === "condition" && (parentType === "do_statement" || parentType === "if_statement" || parentType === "switch_expression" || parentType === "while_statement") || path.node.fieldName !== "body" && parentType === "synchronized_statement")) return group$4(indentInParentheses(group$4(expression), options));
 		else if (hasTernary && hasSuffix && !isAssignment) return group$4([
 			"(",
 			expression,
-			softline$1,
+			closingBracketLine(options),
 			")"
 		]);
 		else return group$4([
@@ -1259,7 +1304,7 @@ var expressions_default = {
 		const args = path.node.namedChildren;
 		if (args.length === 0) {
 			const shouldBreak = path.node.comments?.some(({ type, leading, trailing }) => !leading && !trailing && type === "line_comment");
-			return group$4(indentInParentheses(printDanglingComments(path)), { shouldBreak });
+			return group$4(indentInParentheses(printDanglingComments(path), options), { shouldBreak });
 		}
 		const lastArgIndex = args.length - 1;
 		let anyArgEmptyLine = false;
@@ -1285,7 +1330,7 @@ var expressions_default = {
 			return group$4([
 				"(",
 				indent$4([line$4, ...printedArguments]),
-				line$4,
+				closingBracketLine(options, line$4),
 				")"
 			], { shouldBreak: true });
 		}
@@ -1357,7 +1402,7 @@ var expressions_default = {
 				allArgsBrokenOut()
 			]);
 		}
-		return group$4(indentInParentheses(printedArguments), { shouldBreak: printedArguments.some(willBreak) || anyArgEmptyLine });
+		return group$4(indentInParentheses(printedArguments, options), { shouldBreak: printedArguments.some(willBreak) || anyArgEmptyLine });
 	},
 	array_creation_expression(path, print) {
 		const parts = ["new "];
@@ -1398,8 +1443,8 @@ var expressions_default = {
 	record_pattern(path, print) {
 		return path.map(print, "children");
 	},
-	record_pattern_body(path, print) {
-		return group$4(indentInParentheses(join$4([",", line$4], path.map(print, "namedChildren"))));
+	record_pattern_body(path, print, options) {
+		return group$4(indentInParentheses(join$4([",", line$4], path.map(print, "namedChildren")), options));
 	},
 	record_pattern_component(path, print) {
 		return join$4(" ", path.map(print, "children"));
@@ -1451,8 +1496,8 @@ function printArrowFunctionSignatures(path, { signatureDocs }) {
 	if (node.fieldName === "object" && parent?.type === "method_invocation") return group$4(join$4([" ->", line$4], signatureDocs));
 	return group$4(indent$4(join$4([" ->", line$4], signatureDocs)));
 }
-function printArrowFunctionBody(path, args, { bodyDoc, bodyComments, shouldPutBodyOnSameLine }) {
-	const trailingSpace = args && typeof args === "object" && "expandLastArg" in args && args.expandLastArg && !path.node.comments ? softline$1 : "";
+function printArrowFunctionBody(path, args, options, { bodyDoc, bodyComments, shouldPutBodyOnSameLine }) {
+	const trailingSpace = args && typeof args === "object" && "expandLastArg" in args && args.expandLastArg && !path.node.comments ? closingBracketLine(options) : "";
 	return shouldPutBodyOnSameLine ? [
 		" ",
 		bodyDoc,
@@ -1809,7 +1854,7 @@ 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)) : typeParameters);
+			parts.push(hasMultipleClauses ? group$3(indent$3(typeParameters)) : options?.braceStyle === "next-line" ? group$3(typeParameters) : typeParameters);
 		}
 		if (hasExtendsInterfaces || hasPermits) {
 			const clauses = [];
@@ -1859,13 +1904,13 @@ var interfaces_default = {
 	marker_annotation(path, print) {
 		return ["@", path.call(print, "nameNode")];
 	},
-	annotation_argument_list(path, print) {
+	annotation_argument_list(path, print, options) {
 		const args = path.map(print, "namedChildren");
 		return args.length === 1 && path.node.namedChildren[0].type === "element_value_array_initializer" ? [
 			"(",
 			args[0],
 			")"
-		] : group$3(indentInParentheses(join$3([",", line$3], args)));
+		] : group$3(indentInParentheses(join$3([",", line$3], args), options));
 	},
 	element_value_pair(path, print) {
 		return group$3([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-java-next-line",
-  "version": "2.11.0",
+  "version": "2.11.1",
   "description": "Prettier Java plugin with configurable same-line and next-line braces",
   "homepage": "https://github.com/motlin/prettier-java-next-line",
   "repository": {