Correct all cases involving AstNodes::CallExpression and AstNodes::NewExpression

Author: Dunqing

crates/oxc_formatter/src/utils/call_expression.rs

@@ -36,7 +36,7 @@ pub fn is_test_call_expression(call: &AstNode<CallExpression<'_>>) -> bool {
     match (args.next(), args.next(), args.next()) {
         (Some(argument), None, None) if arguments.len() == 1 => {
             if is_angular_test_wrapper(call) && {
-                if let AstNodes::CallExpression(call) = call.grand_parent() {
+                if let AstNodes::CallExpression(call) = call.parent {
                     is_test_call_expression(call)
                 } else {
                     false

crates/oxc_formatter/src/utils/mod.rs

@@ -29,7 +29,9 @@ use crate::{
 /// `connect(a, b, c)(d)`
 /// ```
 pub fn is_long_curried_call(call: &AstNode<'_, CallExpression<'_>>) -> bool {
-    if let AstNodes::CallExpression(parent_call) = call.parent {
+    if let AstNodes::CallExpression(parent_call) = call.parent
+        && parent_call.is_callee_span(call.span)
+    {
         return call.arguments().len() > parent_call.arguments().len()
             && !parent_call.arguments().is_empty();
     }

crates/oxc_formatter/src/write/as_or_satisfies_expression.rs

@@ -56,13 +56,9 @@ fn format_as_or_satisfies_expression<'a>(
 
 fn is_callee_or_object_context(span: Span, parent: &AstNodes<'_>) -> bool {
     match parent {
-        // Callee
-        AstNodes::CallExpression(_) | AstNodes::NewExpression(_)
         // Static member
-        | AstNodes::StaticMemberExpression(_) => true,
-        AstNodes::ComputedMemberExpression(member) => {
-            member.object.span() == span
-        }
-        _ => false,
+        AstNodes::StaticMemberExpression(_) => true,
+        AstNodes::ComputedMemberExpression(member) => member.object.span() == span,
+        _ => parent.is_call_like_callee_span(span),
     }
 }

crates/oxc_formatter/src/write/binary_like_expression.rs

@@ -227,9 +227,7 @@ 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().span() == self.span(),
-            AstNodes::NewExpression(new) => new.callee().span() == self.span(),
-            _ => false,
+            _ => parent.is_call_like_callee_span(self.span()),
         };
 
         if is_inside_parenthesis {

crates/oxc_formatter/src/write/mod.rs

@@ -415,11 +415,9 @@ impl<'a> FormatWrite<'a> for AstNode<'a, AwaitExpression<'a>> {
         let format_inner = format_with(|f| write!(f, ["await", space(), self.argument()]));
 
         let is_callee_or_object = match self.parent {
-            AstNodes::CallExpression(_)
-            | AstNodes::NewExpression(_)
-            | AstNodes::StaticMemberExpression(_) => true,
+            AstNodes::StaticMemberExpression(_) => true,
             AstNodes::ComputedMemberExpression(member) => member.object.span() == self.span(),
-            _ => false,
+            _ => self.parent.is_call_like_callee_span(self.span),
         };
 
         if is_callee_or_object {

crates/oxc_formatter/src/write/parameters.rs

@@ -52,9 +52,9 @@ impl<'a> FormatWrite<'a> for AstNode<'a, FormalParameters<'a>> {
             ParameterLayout::NoParameters
         } else if can_hug || {
             // `self`: Function
-            // `self.ancestors().nth(1)`: Argument
-            // `self.ancestors().nth(2)`: CallExpression
-            if let Some(AstNodes::CallExpression(call)) = self.ancestors().nth(2) {
+            // `self.parent`: Function
+            // `self.grand_parent()`: CallExpression
+            if let AstNodes::CallExpression(call) = self.grand_parent() {
                 is_test_call_expression(call)
             } else {
                 false

crates/oxc_formatter/tests/fixtures/js/comments/return.js.snap

@@ -15,10 +15,7 @@ function escapePathForGlob(path) {
 function escapePathForGlob(path) {
   return fastGlob
     .escapePath(
-      path.replaceAll(
-        "\\",
-        "\0",
-      ), // Workaround for fast-glob#262 (part 1)
+      path.replaceAll("\\", "\0"), // Workaround for fast-glob#262 (part 1)
     )
     .replaceAll(String.raw`\!`, "@(!)") // Workaround for fast-glob#261
     .replaceAll("\0", String.raw`@(\\)`); // Workaround for fast-glob#262 (part 2)

tasks/prettier_conformance/snapshots/prettier.js.snap.md

@@ -1,4 +1,4 @@
-js compatibility: 685/749 (91.46%)
+js compatibility: 691/749 (92.26%)
 
 # Failed
 
@@ -32,7 +32,6 @@ js compatibility: 685/749 (91.46%)
 | js/for/9812.js | 💥 | 82.83% |
 | js/for/for-in-with-initializer.js | 💥 | 37.50% |
 | js/for/parentheses.js | 💥 | 96.00% |
-| js/functional-composition/pipe-function-calls.js | 💥 | 87.80% |
 | js/identifier/for-of/let.js | 💥 | 92.31% |
 | js/identifier/parentheses/let.js | 💥💥 | 82.27% |
 | js/if/comment-between-condition-and-body.js | 💥 | 65.79% |
@@ -41,12 +40,10 @@ js compatibility: 685/749 (91.46%)
 | js/if/trailing_comment.js | 💥 | 91.43% |
 | js/last-argument-expansion/dangling-comment-in-arrow-function.js | 💥 | 22.22% |
 | js/object-multiline/multiline.js | 💥✨ | 22.22% |
-| js/preserve-line/parameter-list.js | 💥 | 97.37% |
 | 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/require.js | 💥 | 93.83% |
 | js/sequence-expression/ignored.js | 💥 | 25.00% |
 | js/strings/template-literals.js | 💥💥 | 98.01% |
 | js/ternaries/binary.js | 💥💥💥💥✨✨✨✨ | 18.42% |
@@ -58,11 +55,8 @@ js compatibility: 685/749 (91.46%)
 | js/ternaries/parenthesis.js | 💥💥💥💥✨✨✨✨ | 12.50% |
 | js/ternaries/test.js | 💥💥💥💥✨✨✨✨ | 22.40% |
 | js/ternaries/parenthesis/await-expression.js | 💥✨ | 14.29% |
-| js/test-declarations/angular_async.js | 💥💥 | 86.21% |
-| js/test-declarations/angular_fakeAsync.js | 💥💥 | 75.86% |
-| js/test-declarations/angular_waitForAsync.js | 💥💥 | 75.86% |
-| js/test-declarations/angularjs_inject.js | 💥💥 | 69.84% |
-| js/test-declarations/test_declarations.js | 💥💥 | 93.08% |
+| js/test-declarations/angularjs_inject.js | 💥💥 | 91.53% |
+| js/test-declarations/test_declarations.js | 💥💥 | 95.88% |
 | jsx/fbt/test.js | 💥 | 84.06% |
 | jsx/ignore/jsx_ignore.js | 💥 | 92.59% |
 | jsx/jsx/quotes.js | 💥💥💥💥 | 79.41% |

tasks/prettier_conformance/snapshots/prettier.ts.snap.md

@@ -1,4 +1,4 @@
-ts compatibility: 534/598 (89.30%)
+ts compatibility: 540/598 (90.30%)
 
 # Failed
 
@@ -13,10 +13,6 @@ ts compatibility: 534/598 (89.30%)
 | typescript/angular-component-examples/15934.component.ts | 💥💥 | 53.85% |
 | typescript/angular-component-examples/test.component.ts | 💥💥 | 41.18% |
 | typescript/arrow/comments.ts | 💥✨ | 44.44% |
-| typescript/as/as.ts | 💥 | 92.65% |
-| typescript/as/long-identifiers.ts | 💥 | 89.66% |
-| typescript/cast/generic-cast.ts | 💥 | 97.37% |
-| typescript/cast/hug-args.ts | 💥 | 70.59% |
 | typescript/chain-expression/call-expression.ts | 💥 | 64.06% |
 | typescript/chain-expression/member-expression.ts | 💥 | 59.70% |
 | typescript/chain-expression/test.ts | 💥 | 0.00% |
@@ -41,7 +37,6 @@ ts compatibility: 534/598 (89.30%)
 | typescript/decorators/comments.ts | 💥 | 60.00% |
 | typescript/decorators/decorators-comments.ts | 💥 | 65.71% |
 | typescript/decorators-ts/angular.ts | 💥 | 87.50% |
-| typescript/functional-composition/pipe-function-calls.ts | 💥 | 82.76% |
 | typescript/instantiation-expression/17714.ts | 💥 | 0.00% |
 | typescript/interface/comments-generic.ts | 💥💥 | 41.94% |
 | typescript/interface/long-extends.ts | 💥💥 | 83.64% |
@@ -59,8 +54,7 @@ ts compatibility: 534/598 (89.30%)
 | typescript/prettier-ignore/mapped-types.ts | 💥 | 96.61% |
 | typescript/property-signature/consistent-with-flow/comments.ts | 💥 | 80.00% |
 | typescript/property-signature/consistent-with-flow/union.ts | 💥 | 85.71% |
-| typescript/satisfies-operators/hug-args.ts | 💥💥 | 0.00% |
-| typescript/test-declarations/test_declarations.ts | 💥💥 | 40.00% |
+| typescript/test-declarations/test_declarations.ts | 💥💥 | 50.00% |
 | typescript/type-params/18041.ts | 💥 | 43.75% |
 | typescript/type-params/constraints-and-default-2.ts | 💥 | 97.60% |
 | typescript/type-params/constraints-and-default.ts | 💥 | 87.32% |