Skip to content

fix: indent binary expressions in annotation element value or argument lists #774

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
Sep 9, 2025
Merged

fix: indent binary expressions in annotation element value or argument lists #774

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
10 changes: 9 additions & 1 deletion packages/prettier-plugin-java/src/printers/expressions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,12 @@ export default {
(operators.length > 0 && !children.AssignmentOperator) ||
(children.expression !== undefined &&
isBinaryExpression(children.expression[0]));
const isInList =
(path.getNode(4) as JavaNonTerminal | null)?.name === "elementValue" ||
(path.getNode(6) as JavaNonTerminal | null)?.name === "argumentList";
return binary(operands, operators, {
hasNonAssignmentOperators,
isInList,
isRoot: true,
operatorPosition: options.experimentalOperatorPosition
});
Expand Down Expand Up @@ -627,10 +631,12 @@ function binary(
operators: { image: string; doc: Doc }[],
{
hasNonAssignmentOperators = false,
isInList = false,
isRoot = false,
operatorPosition
}: {
hasNonAssignmentOperators?: boolean;
isInList?: boolean;
isRoot?: boolean;
operatorPosition: "end" | "start";
}
Expand Down Expand Up @@ -686,7 +692,9 @@ function binary(
level.push(operands.shift()!);
if (
!levelOperator ||
(!isAssignmentOperator(levelOperator) && levelOperator !== "instanceof")
(!isInList &&
!isAssignmentOperator(levelOperator) &&
levelOperator !== "instanceof")
) {
return group(level);
}
Expand Down
4 changes: 2 additions & 2 deletions ...prettier-plugin-java/test/unit-test/binary_expressions/operator-position-end/_output.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ public void binaryOperation() {

@Annotation(
"This operation with two very long string should break" +
"in a very nice way"
"in a very nice way"
)
public String binaryOperationThatShouldBreak() {
System.out.println(
"This operation with two very long string should break" +
"in a very nice way"
"in a very nice way"
);
return (
"This operation with two very long string should break" +
Expand Down
4 changes: 2 additions & 2 deletions ...ettier-plugin-java/test/unit-test/binary_expressions/operator-position-start/_output.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ public void binaryOperation() {

@Annotation(
"This operation with two very long string should break"
+ "in a very nice way"
+ "in a very nice way"
)
public String binaryOperationThatShouldBreak() {
System.out.println(
"This operation with two very long string should break"
+ "in a very nice way"
+ "in a very nice way"
);
return (
"This operation with two very long string should break"
Expand Down