fix(rome_js_formatter): empty statements in if/else and do/while

crates/rome_js_formatter/src/js/statements/do_while_statement.rs

@@ -1,8 +1,8 @@
 use crate::prelude::*;
 
 use crate::FormatNodeFields;
-use rome_js_syntax::JsDoWhileStatement;
 use rome_js_syntax::JsDoWhileStatementFields;
+use rome_js_syntax::{JsAnyStatement, JsDoWhileStatement};
 
 impl FormatNodeFields<JsDoWhileStatement> for FormatNodeRule<JsDoWhileStatement> {
     fn format_fields(
@@ -19,7 +19,7 @@ impl FormatNodeFields<JsDoWhileStatement> for FormatNodeRule<JsDoWhileStatement>
             semicolon_token,
         } = node.as_fields();
 
-        let head = formatted![formatter, [do_token.format(), space_token(),]]?;
+        let head = formatted![formatter, [do_token.format()]]?;
 
         let tail = formatted![
             formatter,
@@ -39,6 +39,11 @@ impl FormatNodeFields<JsDoWhileStatement> for FormatNodeRule<JsDoWhileStatement>
             ]
         ]?;
 
-        formatted![formatter, [head, body.format(), tail,]]
+        let body = body?;
+        if matches!(body, JsAnyStatement::JsEmptyStatement(_)) {
+            formatted![formatter, [head, body.format(), hard_line_break(), tail,]]
+        } else {
+            formatted![formatter, [head, space_token(), body.format(), tail,]]
+        }
     }
 }

crates/rome_js_formatter/src/js/statements/empty_statement.rs

@@ -1,16 +1,25 @@
 use crate::prelude::*;
 
 use crate::FormatNodeFields;
-use rome_js_syntax::JsEmptyStatement;
-use rome_js_syntax::JsEmptyStatementFields;
+use rome_js_syntax::{JsEmptyStatement, JsEmptyStatementFields, JsSyntaxKind};
+use rome_rowan::AstNode;
 
 impl FormatNodeFields<JsEmptyStatement> for FormatNodeRule<JsEmptyStatement> {
     fn format_fields(
         node: &JsEmptyStatement,
         formatter: &Formatter<JsFormatOptions>,
     ) -> FormatResult<FormatElement> {
         let JsEmptyStatementFields { semicolon_token } = node.as_fields();
-
-        Ok(formatter.format_replaced(&semicolon_token?, empty_element()))
+        let parent_kind = node.syntax().parent().map(|p| p.kind());
+        if matches!(
+            parent_kind,
+            Some(JsSyntaxKind::JS_DO_WHILE_STATEMENT)
+                | Some(JsSyntaxKind::JS_IF_STATEMENT)
+                | Some(JsSyntaxKind::JS_ELSE_CLAUSE)
+        ) {
+            formatted![formatter, [semicolon_token.format()]]
+        } else {
+            Ok(formatter.format_replaced(&semicolon_token?, empty_element()))
+        }
     }
 }

crates/rome_js_formatter/src/js/statements/if_statement.rs

@@ -32,7 +32,6 @@ impl FormatNodeFields<JsIfStatement> for FormatNodeRule<JsIfStatement> {
                         [
                             space_token(),
                             else_token.format(),
-                            space_token(),
                             into_block(formatter, alternate)?,
                         ]
                     ]?);
@@ -76,7 +75,6 @@ fn format_if_element(
                 )
                 .soft_block_indent()
                 .finish()?,
-            space_token(),
             into_block(formatter, consequent?)?,
         ]
     ]?;
@@ -89,22 +87,22 @@ fn into_block(
     formatter: &Formatter<JsFormatOptions>,
     stmt: JsAnyStatement,
 ) -> FormatResult<FormatElement> {
+    let formatted_statement = stmt.format();
+
     if matches!(stmt, JsAnyStatement::JsBlockStatement(_)) {
-        return formatted![formatter, [stmt.format()]];
+        return formatted![formatter, [space_token(), formatted_statement]];
     }
 
     // If the body is an empty statement, force a line break to ensure behavior
     // is coherent with `is_non_collapsable_empty_block`
     if matches!(stmt, JsAnyStatement::JsEmptyStatement(_)) {
-        return formatted![
-            formatter,
-            [token("{"), stmt.format(), hard_line_break(), token("}")]
-        ];
+        return formatted![formatter, [formatted_statement, hard_line_break()]];
     }
 
     formatted![
         formatter,
         [
+            space_token(),
             token("{"),
             block_indent(formatted![formatter, [stmt.format()]]?),
             token("}"),

crates/rome_js_formatter/tests/specs/js/module/statement/do_while.js

@@ -9,4 +9,7 @@ do { // trailing
     var foo = 4
 }
 
-while (something)
+while (something)
+
+
+do; while(true);

crates/rome_js_formatter/tests/specs/js/module/statement/do_while.js.snap

@@ -1,6 +1,8 @@
 ---
 source: crates/rome_js_formatter/tests/spec_test.rs
+assertion_line: 242
 expression: do_while.js
+
 ---
 # Input
 do {
@@ -15,6 +17,9 @@ do { // trailing
 }
 
 while (something)
+
+
+do; while(true);
 =============================
 # Outputs
 ## Output 1
@@ -32,3 +37,6 @@ do {
 	var foo = 4;
 } while (something);
 
+do;
+while (true);
+

crates/rome_js_formatter/tests/specs/js/module/statement/if_else.js

@@ -1,3 +1,6 @@
+if(a);
+if(a); else ;
+
 if (Math.random() > 0.5) {
 	console.log(1)
 } else if (Math.random() > 0.5) {

crates/rome_js_formatter/tests/specs/js/module/statement/if_else.js.snap

@@ -1,8 +1,13 @@
 ---
 source: crates/rome_js_formatter/tests/spec_test.rs
+assertion_line: 242
 expression: if_else.js
+
 ---
 # Input
+if(a);
+if(a); else ;
+
 if (Math.random() > 0.5) {
 	console.log(1)
 } else if (Math.random() > 0.5) {
@@ -71,6 +76,10 @@ Indent style: Tab
 Line width: 80
 Quote style: Double Quotes
 -----
+if (a);
+if (a);
+else;
+
 if (Math.random() > 0.5) {
 	console.log(1);
 } else if (Math.random() > 0.5) {
@@ -122,6 +131,5 @@ if (true) {
 
 if (true) {
 	that();
-} else {
-}
+} else;
 

crates/rome_js_formatter/tests/specs/prettier/js/empty-statement/body.js.snap

@@ -1,6 +1,6 @@
 ---
 source: crates/rome_js_formatter/tests/prettier_tests.rs
-assertion_line: 144
+assertion_line: 175
 expression: body.js
 
 ---
@@ -19,15 +19,15 @@ do; while(1);
 # Output
 ```js
 with (a);
-if (1) {
-} else if (2) {
-} else {
-}
+if (1);
+else if (2);
+else;
 for (;;);
 while (1);
 for (var i in o);
 for (var i of o);
-do while (1);
+do;
+while (1);
 
 ```