Skip to content

fix: proper breaking of parenthesized expressions #800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtkiesel merged 1 commit into from
Jan 6, 2026
Merged

fix: proper breaking of parenthesized expressions #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 47 additions & 22 deletions packages/prettier-plugin-java/src/printers/expressions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type {
BinaryExpressionCstNode,
FqnOrRefTypeCtx,
PrimaryCstNode,
StringTemplateCstNode,
TextBlockTemplateCstNode
} from "java-parser";
Expand All @@ -12,6 +14,7 @@ import {
each,
findBaseIndent,
flatMap,
hasAssignmentOperators,
hasLeadingComments,
hasNonAssignmentOperators,
indentInParentheses,
Expand Down Expand Up @@ -117,8 +120,11 @@ export default {

conditionalExpression(path, print, options) {
const binaryExpression = call(path, print, "binaryExpression");
const grandparentNodeName = (path.getNode(4) as JavaNonTerminal | null)
?.name;
const isInParentheses = grandparentNodeName === "parenthesisExpression";
if (!path.node.children.QuestionMark) {
return binaryExpression;
return isInParentheses ? binaryExpression : group(binaryExpression);
}
const [consequent, alternate] = map(path, print, "expression");
const suffix = [
Expand All @@ -127,16 +133,16 @@ export default {
line,
[": ", options.useTabs ? indent(alternate) : align(2, alternate)]
];
const isNestedTernary =
(path.getNode(4) as JavaNonTerminal | null)?.name ===
"conditionalExpression";
const isNestedTernary = grandparentNodeName === "conditionalExpression";
const alignedSuffix =
!isNestedTernary || options.useTabs
? suffix
: align(Math.max(0, options.tabWidth - 2), suffix);
return isNestedTernary
? [binaryExpression, alignedSuffix]
: group([binaryExpression, indent(alignedSuffix)]);
if (isNestedTernary) {
return [group(binaryExpression), alignedSuffix];
}
const parts = [group(binaryExpression), indent(alignedSuffix)];
return isInParentheses ? parts : group(parts);
},

binaryExpression(path, print, options) {
Expand Down Expand Up @@ -373,20 +379,39 @@ export default {

parenthesisExpression(path, print) {
const expression = call(path, print, "expression");
const ancestorName = (path.getNode(14) as JavaNonTerminal | null)?.name;
const binaryExpression = path.getNode(8) as JavaNonTerminal | null;
const primaryAncestor = path.getNode(4) as PrimaryCstNode | null;
const binaryExpressionAncestor = path.getNode(
8
) as BinaryExpressionCstNode | null;
const outerAncestor = path.getNode(14) as JavaNonTerminal | null;
const { conditionalExpression, lambdaExpression } =
path.node.children.expression[0].children;
const hasLambda = lambdaExpression !== undefined;
const hasTernary =
conditionalExpression?.[0].children.QuestionMark !== undefined;
return ancestorName &&
["guard", "returnStatement"].includes(ancestorName) &&
binaryExpression &&
binaryExpression.name === "binaryExpression" &&
Object.keys(binaryExpression.children).length === 1
? indentInParentheses(expression)
: ["(", hasLambda || hasTernary ? expression : indent(expression), ")"];
const hasSuffix = primaryAncestor?.children.primarySuffix !== undefined;
const isAssignment =
(outerAncestor?.name === "binaryExpression" &&
hasAssignmentOperators(outerAncestor)) ||
outerAncestor?.name === "variableInitializer";
if (!hasLambda && hasSuffix && (!hasTernary || isAssignment)) {
return indentInParentheses(hasTernary ? group(expression) : expression);
} else if (
binaryExpressionAncestor &&
Object.keys(binaryExpressionAncestor.children).length === 1 &&
outerAncestor &&
["guard", "returnStatement"].includes(outerAncestor.name)
) {
return indentInParentheses(group(expression));
} else if (hasTernary && hasSuffix && !isAssignment) {
return group(["(", expression, softline, ")"]);
} else {
return group([
"(",
hasLambda || hasTernary ? expression : indent(expression),
")"
]);
}
},

castExpression: printSingle,
Expand Down Expand Up @@ -699,8 +724,8 @@ function binary(
operands.unshift(
levelOperator !== undefined &&
needsParentheses(nextOperator, levelOperator)
? ["(", indent(content), ")"]
: content
? ["(", group(indent(content)), ")"]
: group(content)
);
}
}
Expand All @@ -711,17 +736,17 @@ function binary(
!isAssignmentOperator(levelOperator) &&
levelOperator !== "instanceof")
) {
return group(level);
return level;
}
if (!isRoot || hasNonAssignmentOperators) {
return group(indent(level));
return indent(level);
}
const groupId = Symbol("assignment");
return group([
return [
level[0],
group(indent(level[1]), { id: groupId }),
indentIfBreak(level[2], { groupId })
]);
];
}

const precedencesByOperator = new Map(
Expand Down
14 changes: 8 additions & 6 deletions packages/prettier-plugin-java/src/printers/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,15 +376,17 @@ export function isBinaryExpression(expression: ExpressionCstNode) {
return hasNonAssignmentOperators(conditionalExpression.binaryExpression[0]);
}

export function hasAssignmentOperators(
binaryExpression: BinaryExpressionCstNode
) {
return binaryExpression.children.AssignmentOperator !== undefined;
}

export function hasNonAssignmentOperators(
binaryExpression: BinaryExpressionCstNode
) {
return Object.values(binaryExpression.children).some(
child =>
isTerminal(child[0]) &&
!child[0].tokenType.CATEGORIES?.some(
category => category.name === "AssignmentOperator"
)
return Object.keys(binaryExpression.children).some(name =>
["BinaryOperator", "Instanceof", "shiftOperator"].includes(name)
);
}

Expand Down
40 changes: 39 additions & 1 deletion packages/prettier-plugin-java/test/unit-test/expressions/_input.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,5 +207,43 @@ public void nonStaticMultipleChainedMethodInvocations() {
public void typeExpressionsInFqnParts() {
var myVariable = ImmutableMap.<R, V>of<T>::a();
}
}

void parenthesesWithLeadingAndTrailingBreak() {
(aaaaaaaaaa + bbbbbbbbbb + cccccccccc + dddddddddd + eeeeeeeeee).ffffffffff();
(aaaaaaaaaa + bbbbbbbbbb + cccccccccc + dddddddddd + eeeeeeeeee)::ffffffffff;

aaaaaaaaaa = (bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee).ffffffffff();
aaaaaaaaaa = (bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee)::ffffffffff;
aaaaaaaaaa = (bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee)[ffffffffff];

Aaaaaaaaaa aaaaaaaaaa = (bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee).ffffffffff();
Aaaaaaaaaa aaaaaaaaaa = (bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee)::ffffffffff;
Aaaaaaaaaa aaaaaaaaaa = (bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee)[ffffffffff];

switch (a) {
case Bbbbbbbbbb bbbbbbbbbb when (cccccccccc && dddddddddd && eeeeeeeeee) -> ffffffffff;
}

return (aaaaaaaaaa && bbbbbbbbbb && cccccccccc && dddddddddd && eeeeeeeeee && ffffffffff);
}

void parenthesesWithTrailingBreak() {
(aaaaaaaaaa && bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee).ffffffffff();
(aaaaaaaaaa && bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee)::ffffffffff;
(aaaaaaaaaa && bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee)[ffffffffff];
}

void parenthesesWithoutBreak() {
(aaaaaaaaaa -> bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee).ffffffffff();
(aaaaaaaaaa -> bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee)::ffffffffff;
(aaaaaaaaaa -> bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee)[ffffffffff];

aaaaaaaaaa = (bbbbbbbbbb -> cccccccccc ? dddddddddd : eeeeeeeeee).ffffffffff();
aaaaaaaaaa = (bbbbbbbbbb -> cccccccccc ? dddddddddd : eeeeeeeeee)::ffffffffff;
aaaaaaaaaa = (bbbbbbbbbb -> cccccccccc ? dddddddddd : eeeeeeeeee)[ffffffffff];

Aaaaaaaaaa aaaaaaaaaa = (bbbbbbbbbb -> cccccccccc ? dddddddddd : eeeeeeeeee).ffffffffff();
Aaaaaaaaaa aaaaaaaaaa = (bbbbbbbbbb -> cccccccccc ? dddddddddd : eeeeeeeeee)::ffffffffff;
Aaaaaaaaaa aaaaaaaaaa = (bbbbbbbbbb -> cccccccccc ? dddddddddd : eeeeeeeeee)[ffffffffff];
}
}
90 changes: 90 additions & 0 deletions packages/prettier-plugin-java/test/unit-test/expressions/_output.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,94 @@ public void nonStaticMultipleChainedMethodInvocations() {
public void typeExpressionsInFqnParts() {
var myVariable = ImmutableMap.<R, V>of<T>::a();
}

void parenthesesWithLeadingAndTrailingBreak() {
(
aaaaaaaaaa +
bbbbbbbbbb +
cccccccccc +
dddddddddd +
eeeeeeeeee
).ffffffffff();
(
aaaaaaaaaa +
bbbbbbbbbb +
cccccccccc +
dddddddddd +
eeeeeeeeee
)::ffffffffff;

aaaaaaaaaa = (
bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee
).ffffffffff();
aaaaaaaaaa = (
bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee
)::ffffffffff;
aaaaaaaaaa = (
bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee
)[ffffffffff];

Aaaaaaaaaa aaaaaaaaaa = (
bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee
).ffffffffff();
Aaaaaaaaaa aaaaaaaaaa = (
bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee
)::ffffffffff;
Aaaaaaaaaa aaaaaaaaaa = (
bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee
)[ffffffffff];

switch (a) {
case Bbbbbbbbbb bbbbbbbbbb when (
cccccccccc && dddddddddd && eeeeeeeeee
) -> ffffffffff;
}

return (
aaaaaaaaaa &&
bbbbbbbbbb &&
cccccccccc &&
dddddddddd &&
eeeeeeeeee &&
ffffffffff
);
}

void parenthesesWithTrailingBreak() {
(aaaaaaaaaa && bbbbbbbbbb && cccccccccc
? dddddddddd
: eeeeeeeeee
).ffffffffff();
(aaaaaaaaaa && bbbbbbbbbb && cccccccccc
? dddddddddd
: eeeeeeeeee
)::ffffffffff;
(aaaaaaaaaa && bbbbbbbbbb && cccccccccc
? dddddddddd
: eeeeeeeeee
)[ffffffffff];
}

void parenthesesWithoutBreak() {
(aaaaaaaaaa ->
bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee).ffffffffff();
(aaaaaaaaaa ->
bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee)::ffffffffff;
(aaaaaaaaaa ->
bbbbbbbbbb && cccccccccc ? dddddddddd : eeeeeeeeee)[ffffffffff];

aaaaaaaaaa = (bbbbbbbbbb ->
cccccccccc ? dddddddddd : eeeeeeeeee).ffffffffff();
aaaaaaaaaa = (bbbbbbbbbb ->
cccccccccc ? dddddddddd : eeeeeeeeee)::ffffffffff;
aaaaaaaaaa = (bbbbbbbbbb ->
cccccccccc ? dddddddddd : eeeeeeeeee)[ffffffffff];

Aaaaaaaaaa aaaaaaaaaa = (bbbbbbbbbb ->
cccccccccc ? dddddddddd : eeeeeeeeee).ffffffffff();
Aaaaaaaaaa aaaaaaaaaa = (bbbbbbbbbb ->
cccccccccc ? dddddddddd : eeeeeeeeee)::ffffffffff;
Aaaaaaaaaa aaaaaaaaaa = (bbbbbbbbbb ->
cccccccccc ? dddddddddd : eeeeeeeeee)[ffffffffff];
}
}