Skip to content

fix(formatter): print parenthesis for sequence expression in ReturnStatement and ExpressionStatement #15062

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
graphite-app merged 1 commit into from
Oct 30, 2025
Merged

fix(formatter): print parenthesis for sequence expression in ReturnStatement and ExpressionStatement #15062

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
11 changes: 6 additions & 5 deletions crates/oxc_formatter/src/parentheses/expression.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,14 +579,15 @@ impl NeedsParentheses<'_> for AstNode<'_, SequenceExpression<'_>> {
return false;
}

!matches!(
self.parent,
match self.parent {
AstNodes::ReturnStatement(_)
| AstNodes::ThrowStatement(_)
// There's a precedence for writing `x++, y++`
| AstNodes::ForStatement(_)
| AstNodes::ExpressionStatement(_)
| AstNodes::SequenceExpression(_)
)
| AstNodes::SequenceExpression(_) => false,
AstNodes::ExpressionStatement(stmt) => !stmt.is_arrow_function_body(),
_ => true,
}
}
}

Expand Down
12 changes: 5 additions & 7 deletions crates/oxc_formatter/src/write/return_or_throw_statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ impl<'a> Format<'a> for FormatAdjacentArgument<'a, '_> {
&& has_argument_leading_comments(argument, f)
{
write!(f, [text("("), &block_indent(&argument), text(")")])
} else if is_binary_or_sequence_argument(argument) {
} else if argument.is_binaryish() {
write!(
f,
[group(&format_args!(
Expand All @@ -104,6 +104,8 @@ impl<'a> Format<'a> for FormatAdjacentArgument<'a, '_> {
if_group_breaks(&text(")"))
))]
)
} else if matches!(argument.as_ref(), Expression::SequenceExpression(_)) {
write!(f, [group(&format_args!(text("("), soft_block_indent(&argument), text(")")))])
} else {
write!(f, argument)
}
Expand Down Expand Up @@ -168,11 +170,7 @@ fn has_argument_leading_comments(argument: &AstNode<Expression>, f: &Formatter<'
false
}

#[inline]
fn is_binary_or_sequence_argument(argument: &Expression) -> bool {
matches!(
argument,
Expression::BinaryExpression(_)
| Expression::LogicalExpression(_)
| Expression::SequenceExpression(_)
)
matches!(argument, Expression::BinaryExpression(_) | Expression::LogicalExpression(_))
}
13 changes: 1 addition & 12 deletions tasks/prettier_conformance/snapshots/prettier.js.snap.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
js compatibility: 673/749 (89.85%)
js compatibility: 684/749 (91.32%)

# Failed

Expand Down Expand Up @@ -43,24 +43,14 @@ js compatibility: 673/749 (89.85%)
| js/last-argument-expansion/dangling-comment-in-arrow-function.js | 💥 | 22.22% |
| js/logical-expressions/multiple-comments/17192.js | 💥 | 60.00% |
| js/method-chain/issue-17457.js | 💥 | 0.00% |
| js/no-semi/issue2006.js | 💥💥 | 75.00% |
| js/no-semi/no-semi.js | 💥💥 | 98.90% |
| js/object-multiline/multiline.js | 💥✨ | 22.22% |
| js/quote-props/classes.js | 💥💥✨✨ | 47.06% |
| js/quote-props/objects.js | 💥💥✨✨ | 45.10% |
| js/quote-props/with_numbers.js | 💥💥✨✨ | 46.43% |
| js/quotes/objects.js | 💥💥 | 80.00% |
| js/require/comments.js | 💥 | 81.25% |
| js/require/long-module-name.js | 💥 | 18.18% |
| js/reserved-word/interfaces.js | 💥 | 85.71% |
| js/reserved-word/let.js | 💥 | 85.71% |
| js/reserved-word/yield.js | 💥 | 85.71% |
| js/sequence-break/break.js | 💥 | 90.91% |
| js/sequence-expression/expression.js | 💥 | 33.33% |
| js/sequence-expression/ignored.js | 💥 | 25.00% |
| js/sequence-expression/return.js | 💥 | 50.00% |
| js/sequence-expression/no-semi/expression.js | 💥 | 50.00% |
| js/strings/non-octal-eight-and-nine.js | 💥💥 | 71.43% |
| js/strings/template-literals.js | 💥💥 | 98.01% |
| js/ternaries/binary.js | 💥💥💥💥✨✨✨✨ | 18.42% |
| js/ternaries/func-call.js | 💥💥💥💥✨✨✨✨ | 25.00% |
Expand All @@ -76,7 +66,6 @@ js compatibility: 673/749 (89.85%)
| js/trailing-comma/dynamic-import.js | 💥💥💥 | 0.00% |
| jsx/fbt/test.js | 💥 | 84.06% |
| jsx/jsx/quotes.js | 💥💥💥💥 | 79.41% |
| jsx/jsx/regex.js | 💥💥💥💥 | 75.00% |
| jsx/optional-chaining/optional-chaining.jsx | 💥 | 85.96% |
| jsx/single-attribute-per-line/single-attribute-per-line.js | 💥✨ | 43.37% |
| jsx/text-wrap/test.js | 💥 | 99.56% |
3 changes: 1 addition & 2 deletions tasks/prettier_conformance/snapshots/prettier.ts.snap.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
ts compatibility: 537/598 (89.80%)
ts compatibility: 538/598 (89.97%)

# Failed

| Spec path | Failed or Passed | Match ratio |
| :-------- | :--------------: | :---------: |
| jsx/fbt/test.js | 💥 | 84.06% |
| jsx/jsx/quotes.js | 💥💥💥💥 | 79.41% |
| jsx/jsx/regex.js | 💥💥💥💥 | 75.00% |
| jsx/optional-chaining/optional-chaining.jsx | 💥 | 85.96% |
| jsx/single-attribute-per-line/single-attribute-per-line.js | 💥✨ | 43.37% |
| jsx/text-wrap/test.js | 💥 | 99.56% |
Expand Down
Loading