fix(formatter): should inline ObjectPattern if it is a parameter can hug

Author: Dunqing

crates/oxc_formatter/src/write/object_pattern_like.rs

@@ -9,6 +9,7 @@ use crate::{
         trivia::{DanglingIndentMode, format_dangling_comments},
     },
     write,
+    write::parameters::{get_this_param, should_hug_function_parameters},
 };
 
 use super::{
@@ -44,6 +45,19 @@ impl GetSpan for ObjectPatternLike<'_, '_> {
 }
 
 impl<'a> ObjectPatternLike<'a, '_> {
+    fn is_hug_parameter(
+        &self,
+        node: &AstNode<'a, ObjectPattern<'a>>,
+        f: &Formatter<'_, 'a>,
+    ) -> bool {
+        matches!(node.grand_parent(), AstNodes::FormalParameter(param) if {
+            matches!(param.parent, AstNodes::FormalParameters(params) if {
+                let this_param = get_this_param(params.parent);
+                should_hug_function_parameters(params, this_param, false, f)
+            })
+        })
+    }
+
     fn is_empty(&self) -> bool {
         match self {
             Self::ObjectPattern(o) => o.is_empty(),
@@ -53,13 +67,10 @@ impl<'a> ObjectPatternLike<'a, '_> {
 
     fn is_inline(&self, f: &Formatter<'_, 'a>) -> bool {
         match self {
-            Self::ObjectPattern(node) => match node.parent {
-                AstNodes::FormalParameter(_) => true,
-                AstNodes::AssignmentPattern(_) => {
-                    matches!(node.parent.parent(), AstNodes::FormalParameter(_))
-                }
-                _ => false,
-            },
+            Self::ObjectPattern(node) => {
+                matches!(node.parent, AstNodes::FormalParameter(_))
+                    || self.is_hug_parameter(node, f)
+            }
             Self::ObjectAssignmentTarget(node) => false,
         }
     }

crates/oxc_formatter/src/write/parameters.rs

@@ -301,11 +301,11 @@ pub fn can_avoid_parentheses(
         && !f.comments().has_comment_in_span(arrow.params.span)
 }
 
-pub fn should_hug_function_parameters<'a>(
-    parameters: &AstNode<'a, FormalParameters<'a>>,
-    this_param: Option<&AstNode<'a, TSThisParameter<'a>>>,
+pub fn should_hug_function_parameters(
+    parameters: &AstNode<'_, FormalParameters<'_>>,
+    this_param: Option<&AstNode<'_, TSThisParameter<'_>>>,
     parentheses_not_needed: bool,
-    f: &Formatter<'_, 'a>,
+    f: &Formatter<'_, '_>,
 ) -> bool {
     let list = &parameters.items();
 

crates/oxc_formatter/tests/fixtures/ts/parameters/object-pattern.ts

@@ -12,3 +12,10 @@ export function useCopyToClipboard({ timeout = 2000, onCopy }: {
   timeout?: number;
   onCopy?: () => void;
 } = {}) {}
+
+function callbackUrl(
+  { baseUrl, params }: { baseUrl: string; params?: string } = {
+    baseUrl: "",
+    params: undefined,
+  }
+) { }

crates/oxc_formatter/tests/fixtures/ts/parameters/object-pattern.ts.snap

@@ -17,6 +17,13 @@ export function useCopyToClipboard({ timeout = 2000, onCopy }: {
   onCopy?: () => void;
 } = {}) {}
 
+function callbackUrl(
+  { baseUrl, params }: { baseUrl: string; params?: string } = {
+    baseUrl: "",
+    params: undefined,
+  }
+) { }
+
 ==================== Output ====================
 (
   options,
@@ -39,4 +46,11 @@ export function useCopyToClipboard({
   onCopy?: () => void;
 } = {}) {}
 
+function callbackUrl(
+  { baseUrl, params }: { baseUrl: string; params?: string } = {
+    baseUrl: "",
+    params: undefined,
+  },
+) {}
+
 ===================== End =====================