Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 5 additions & 5 deletions crates/oxc_formatter/src/parentheses/expression.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ impl NeedsParentheses<'_> for AstNode<'_, NumericLiteral<'_>> {
}

if let AstNodes::StaticMemberExpression(member) = self.parent {
return member.object.without_parentheses().span() == self.span();
return member.object.span() == self.span();
}
false
}
Expand Down Expand Up @@ -491,7 +491,7 @@ impl NeedsParentheses<'_> for AstNode<'_, ConditionalExpression<'_>> {
return true;
}
if let AstNodes::ConditionalExpression(e) = parent {
e.test.without_parentheses().span() == self.span()
e.test.span() == self.span()
} else {
update_or_lower_expression_needs_parens(self.span(), parent)
}
Expand Down Expand Up @@ -705,7 +705,7 @@ impl NeedsParentheses<'_> for AstNode<'_, ArrowFunctionExpression<'_>> {
return true;
}
if let AstNodes::ConditionalExpression(e) = parent {
e.test.without_parentheses().span() == self.span()
e.test.span() == self.span()
} else {
update_or_lower_expression_needs_parens(self.span(), parent)
}
Expand Down Expand Up @@ -1075,7 +1075,7 @@ fn await_or_yield_needs_parens(span: Span, node: &AstNodes<'_>) -> bool {
return true;
}
if let AstNodes::ConditionalExpression(e) = node {
e.test.without_parentheses().span() == span
e.test.span() == span
} else {
update_or_lower_expression_needs_parens(span, node)
}
Expand All @@ -1102,7 +1102,7 @@ fn ts_as_or_satisfies_needs_parens(

fn is_class_extends(span: Span, parent: &AstNodes<'_>) -> bool {
if let AstNodes::Class(c) = parent {
return c.super_class.as_ref().is_some_and(|c| c.without_parentheses().span() == span);
return c.super_class.as_ref().is_some_and(|c| c.span() == span);
}
false
}
Expand Down
8 changes: 2 additions & 6 deletions crates/oxc_formatter/src/write/binary_like_expression.rs
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,8 @@ impl<'a> Format<'a> for BinaryLikeExpression<'a, '_> {
// For example, `(a+b)(call)`, `!(a + b)`, `(a + b).test`.
let is_inside_parenthesis = match parent {
AstNodes::StaticMemberExpression(_) | AstNodes::UnaryExpression(_) => true,
AstNodes::CallExpression(call) => {
call.callee().without_parentheses().span() == self.span()
}
AstNodes::NewExpression(new) => {
new.callee().without_parentheses().span() == self.span()
}
AstNodes::CallExpression(call) => call.callee().span() == self.span(),
AstNodes::NewExpression(new) => new.callee().span() == self.span(),
_ => false,
};

Expand Down
Loading