fix(formatter): correct printing yield argument

crates/oxc_formatter/src/write/mod.rs

@@ -83,6 +83,7 @@ use self::{
     object_like::ObjectLike,
     object_pattern_like::ObjectPatternLike,
     parameters::{ParameterLayout, ParameterList},
+    return_or_throw_statement::FormatAdjacentArgument,
     semicolon::OptionalSemicolon,
     type_parameters::{FormatTSTypeParameters, FormatTSTypeParametersOptions},
     utils::{
@@ -935,12 +936,9 @@ impl<'a> FormatWrite<'a, FormatJsArrowFunctionExpressionOptions>
 
 impl<'a> FormatWrite<'a> for AstNode<'a, YieldExpression<'a>> {
     fn write(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
-        write!(f, "yield")?;
-        if self.delegate() {
-            write!(f, "*")?;
-        }
+        write!(f, ["yield", self.delegate().then_some("*")])?;
         if let Some(argument) = &self.argument() {
-            write!(f, [space(), argument])?;
+            write!(f, [space(), FormatAdjacentArgument(argument)])?;
         }
         Ok(())
     }

crates/oxc_formatter/src/write/return_or_throw_statement.rs

@@ -60,7 +60,7 @@ impl<'a> Format<'a> for ReturnAndThrowStatement<'a, '_> {
         write!(f, self.keyword())?;
 
         if let Some(argument) = self.argument() {
-            write!(f, [space(), FormatReturnOrThrowArgument(argument)])?;
+            write!(f, [space(), FormatAdjacentArgument(argument)])?;
         }
 
         let dangling_comments = f.context().comments().comments_before(self.span().end);
@@ -84,9 +84,9 @@ impl<'a> Format<'a> for ReturnAndThrowStatement<'a, '_> {
     }
 }
 
-pub struct FormatReturnOrThrowArgument<'a, 'b>(&'b AstNode<'a, Expression<'a>>);
+pub struct FormatAdjacentArgument<'a, 'b>(pub &'b AstNode<'a, Expression<'a>>);
 
-impl<'a> Format<'a> for FormatReturnOrThrowArgument<'a, '_> {
+impl<'a> Format<'a> for FormatAdjacentArgument<'a, '_> {
     fn fmt(&self, f: &mut Formatter<'_, 'a>) -> FormatResult<()> {
         let argument = self.0;
 

crates/oxc_formatter/tests/fixtures/js/comments/yield.js

@@ -0,0 +1,60 @@
+function *t1() {
+    yield (
+        // comment
+        a as any
+    );
+}
+function *t2() {
+    yield (
+        // comment
+        a as any
+    ) + 1;
+}
+function *t3() {
+    yield (
+        // comment
+        a as any
+    ) ? 0 : 1;
+}
+function *t4() {
+    yield (
+        // comment
+        a as any
+    ).b;
+}
+function *t5() {
+    yield (
+        // comment
+        a as any
+    )[a];
+}
+function *t6() {
+    yield (
+        // comment
+        a as any
+    )();
+}
+function *t7() {
+    yield (
+        // comment
+        a as any
+    )``;
+}
+function *t8() {
+    yield (
+        // comment
+        a as any
+    ) as any;
+}
+function *t9() {
+    yield (
+        // comment
+        a as any
+    ) satisfies any;
+}
+function *t10() {
+    yield (
+        // comment
+        a as any
+    )!;
+}

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

@@ -0,0 +1,68 @@
+---
+source: crates/oxc_formatter/tests/fixtures/mod.rs
+---
+==================== Input ====================
+function *t1() {
+    yield (
+        // comment
+        a as any
+    );
+}
+function *t2() {
+    yield (
+        // comment
+        a as any
+    ) + 1;
+}
+function *t3() {
+    yield (
+        // comment
+        a as any
+    ) ? 0 : 1;
+}
+function *t4() {
+    yield (
+        // comment
+        a as any
+    ).b;
+}
+function *t5() {
+    yield (
+        // comment
+        a as any
+    )[a];
+}
+function *t6() {
+    yield (
+        // comment
+        a as any
+    )();
+}
+function *t7() {
+    yield (
+        // comment
+        a as any
+    )``;
+}
+function *t8() {
+    yield (
+        // comment
+        a as any
+    ) as any;
+}
+function *t9() {
+    yield (
+        // comment
+        a as any
+    ) satisfies any;
+}
+function *t10() {
+    yield (
+        // comment
+        a as any
+    )!;
+}
+
+==================== Output ====================
+
+===================== End =====================

crates/oxc_formatter/tests/fixtures/ts/comments/yield.ts

@@ -0,0 +1,60 @@
+function *t1() {
+    yield (
+        // comment
+        a as any
+    );
+}
+function *t2() {
+    yield (
+        // comment
+        a as any
+    ) + 1;
+}
+function *t3() {
+    yield (
+        // comment
+        a as any
+    ) ? 0 : 1;
+}
+function *t4() {
+    yield (
+        // comment
+        a as any
+    ).b;
+}
+function *t5() {
+    yield (
+        // comment
+        a as any
+    )[a];
+}
+function *t6() {
+    yield (
+        // comment
+        a as any
+    )();
+}
+function *t7() {
+    yield (
+        // comment
+        a as any
+    )``;
+}
+function *t8() {
+    yield (
+        // comment
+        a as any
+    ) as any;
+}
+function *t9() {
+    yield (
+        // comment
+        a as any
+    ) satisfies any;
+}
+function *t10() {
+    yield (
+        // comment
+        a as any
+    )!;
+}

crates/oxc_formatter/tests/fixtures/ts/comments/yield.ts.snap

@@ -0,0 +1,130 @@
+---
+source: crates/oxc_formatter/tests/fixtures/mod.rs
+---
+==================== Input ====================
+function *t1() {
+    yield (
+        // comment
+        a as any
+    );
+}
+function *t2() {
+    yield (
+        // comment
+        a as any
+    ) + 1;
+}
+function *t3() {
+    yield (
+        // comment
+        a as any
+    ) ? 0 : 1;
+}
+function *t4() {
+    yield (
+        // comment
+        a as any
+    ).b;
+}
+function *t5() {
+    yield (
+        // comment
+        a as any
+    )[a];
+}
+function *t6() {
+    yield (
+        // comment
+        a as any
+    )();
+}
+function *t7() {
+    yield (
+        // comment
+        a as any
+    )``;
+}
+function *t8() {
+    yield (
+        // comment
+        a as any
+    ) as any;
+}
+function *t9() {
+    yield (
+        // comment
+        a as any
+    ) satisfies any;
+}
+function *t10() {
+    yield (
+        // comment
+        a as any
+    )!;
+}
+
+==================== Output ====================
+function* t1() {
+  yield (
+    // comment
+    a as any
+  );
+}
+function* t2() {
+  yield (
+    // comment
+    (a as any) + 1
+  );
+}
+function* t3() {
+  yield (
+    // comment
+    (a as any)
+      ? 0
+      : 1
+  );
+}
+function* t4() {
+  yield (
+    // comment
+    (a as any).b
+  );
+}
+function* t5() {
+  yield (
+    // comment
+    (a as any)[a]
+  );
+}
+function* t6() {
+  yield (
+    // comment
+    (a as any)()
+  );
+}
+function* t7() {
+  yield (
+    // comment
+    (a as any)``
+  );
+}
+function* t8() {
+  yield (
+    // comment
+    a as any as any
+  );
+}
+function* t9() {
+  yield (
+    // comment
+    a as any satisfies any
+  );
+}
+function* t10() {
+  yield (
+    // comment
+    (a as any)!
+  );
+}
+
+===================== End =====================