fix: only use do/while newline behaviour when asi (#481)

Author: dsherret

src/generation/generate.rs

@@ -4336,21 +4336,20 @@ fn gen_do_while_stmt<'a>(node: &'a DoWhileStmt, context: &mut Context<'a>) -> Pr
   // the braces are technically optional on do while statements
   let mut items = PrintItems::new();
   items.push_str("do");
-  let open_brace_token = if let Stmt::Block(_) = node.body {
-    context.token_finder.get_first_open_brace_token_within(node)
-  } else {
-    None
-  };
   items.extend(gen_brace_separator(
     GenBraceSeparatorOptions {
       brace_position: context.config.do_while_statement_brace_position,
-      open_brace_token,
+      open_brace_token: if let Stmt::Block(_) = node.body {
+        context.token_finder.get_first_open_brace_token_within(node)
+      } else {
+        None
+      },
       start_header_lsil: None,
     },
     context,
   ));
   items.extend(gen_node(node.body.into(), context));
-  if open_brace_token.is_some() {
+  if context.config.semi_colons.is_true() || matches!(node.body, Stmt::Block(_)) {
     items.extend(gen_control_flow_separator(
       context.config.do_while_statement_next_control_flow_position,
       &node.body.range(),
@@ -4360,7 +4359,7 @@ fn gen_do_while_stmt<'a>(node: &'a DoWhileStmt, context: &mut Context<'a>) -> Pr
       context,
     ));
   } else {
-    // if the body is not a block, then we just always
+    // if ASI and the body is not a block, then we just always
     // put this on the next line for simplicity for now
     items.push_signal(Signal::NewLine);
   }

tests/specs/statements/doWhileStatement/DoWhileStatement_All.txt

@@ -58,3 +58,13 @@ do {
 [expect]
 do {
 } while (true);
+
+== should handle do while with an if stmt ==
+do if (true) {
+    console.log(5);
+} while (true);
+
+[expect]
+do if (true) {
+    console.log(5);
+} while (true);