Fix out of order printing for union/intersection type

rome · Jun 2, 2022 · a464b8d · a464b8d
1 parent 2ac2775
commit a464b8d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/crates/rome_js_formatter/src/js/statements/switch_statement.rs b/crates/rome_js_formatter/src/js/statements/switch_statement.rs
@@ -16,13 +16,13 @@ impl FormatNodeFields<JsSwitchStatement> for FormatNodeRule<JsSwitchStatement> {
             r_curly_token,
         } = node.as_fields();
 
-        let format_cases = format_once(|f| {
+        let format_cases = format_with(|f| {
             if cases.is_empty() {
                 write!(f, [hard_line_break()])?;
             } else {
                 let mut join = f.join_nodes_with_hardline();
 
-                for case in cases {
+                for case in &cases {
                     join.entry(case.syntax(), &case.format());
                 }
 

diff --git a/crates/rome_js_formatter/src/ts/types/intersection_type.rs b/crates/rome_js_formatter/src/ts/types/intersection_type.rs
@@ -11,8 +11,8 @@ impl FormatNodeFields<TsIntersectionType> for FormatNodeRule<TsIntersectionType>
             types,
         } = node.as_fields();
 
-        let leading_separator_token = format_once(|f| {
-            match leading_separator_token {
+        let leading_separator_token = format_with(|f| {
+            match &leading_separator_token {
                 Some(token) => {
                     // The SyntaxToken is converted into a FormatElement using
                     // Token::from to strip the token's trivia pieces which are

diff --git a/crates/rome_js_formatter/src/ts/types/union_type.rs b/crates/rome_js_formatter/src/ts/types/union_type.rs
@@ -11,8 +11,8 @@ impl FormatNodeFields<TsUnionType> for FormatNodeRule<TsUnionType> {
             types,
         } = node.as_fields();
 
-        let format_leading_separator_token = format_once(|f| {
-            match leading_separator_token {
+        let format_leading_separator_token = format_with(|f| {
+            match &leading_separator_token {
                 Some(token) => {
                     // The SyntaxToken is converted into a FormatElement using
                     // Token::from to strip the token's trivia pieces which are
@@ -22,9 +22,9 @@ impl FormatNodeFields<TsUnionType> for FormatNodeRule<TsUnionType> {
                     write!(
                         f,
                         [format_replaced(
-                            &token,
+                            token,
                             &if_group_breaks(format_args!(
-                                format_trimmed_token(&token),
+                                format_trimmed_token(token),
                                 space_token()
                             ))
                         )]
@@ -38,7 +38,7 @@ impl FormatNodeFields<TsUnionType> for FormatNodeRule<TsUnionType> {
         });
 
         let mut buffer = VecBuffer::new(f.state_mut());
-        write!(buffer, [types.format()])?;
+        write!(buffer, [format_leading_separator_token, types.format()])?;
 
         let types = buffer.into_element();
 
@@ -51,7 +51,6 @@ impl FormatNodeFields<TsUnionType> for FormatNodeRule<TsUnionType> {
             [
                 group_elements(indent(format_args![
                     soft_line_break(),
-                    format_leading_separator_token,
                     format_once(|f| {
                         f.write_element(leading_comments)?;
                         f.write_element(types)