Fix multiline_binop_conditional_with_comments

crates/compiler/fmt/src/expr.rs

@@ -828,10 +828,22 @@ fn fmt_if<'a, 'buf>(
                     match &expr_below {
                         Expr::SpaceAfter(expr_above, spaces_after_expr) => {
                             expr_above.format(buf, return_indent);
+
+                            // If any of the spaces is a newline, add a newline at the top.
+                            // Otherwise leave it as just a comment.
+                            let newline_at = if spaces_after_expr
+                                .iter()
+                                .any(|spaces| matches!(spaces, CommentOrNewline::Newline))
+                            {
+                                NewlineAt::Top
+                            } else {
+                                NewlineAt::None
+                            };
+
                             fmt_comments_only(
                                 buf,
                                 spaces_after_expr.iter(),
-                                NewlineAt::None,
+                                newline_at,
                                 return_indent,
                             );
                             buf.newline();
@@ -876,12 +888,18 @@ fn fmt_if<'a, 'buf>(
                         Expr::SpaceAfter(expr_above, spaces_above) => {
                             expr_above.format(buf, return_indent);
 
-                            fmt_comments_only(
+                            // If any of the spaces is a newline, add a newline at the top.
-                                buf,
+                            // Otherwise leave it as just a comment.
-                                spaces_above.iter(),
+                            let newline_at = if spaces_above
-                                NewlineAt::Top,
+                                .iter()
-                                return_indent,
+                                .any(|spaces| matches!(spaces, CommentOrNewline::Newline))
-                            );
+                            {
+                                NewlineAt::Top
+                            } else {
+                                NewlineAt::None
+                            };
+
+                            fmt_comments_only(buf, spaces_above.iter(), newline_at, return_indent);
                             buf.newline();
                         }
 

crates/compiler/fmt/tests/test_fmt.rs

@@ -4037,6 +4037,27 @@ mod test_fmt {
         ));
     }
 
+    #[test]
+    fn multiline_binop_conditional_with_comments() {
+        expr_formats_same(indoc!(
+            r#"
+            if
+                x
+                    + 1 # comment 1
+                    > 0 # comment 2
+            then
+                y
+                    * 2 # comment 3
+                    < 1 # comment 4
+            else
+                42
+            "#
+        ));
+    }
+            "#
+        ));
+    }
+
     #[test]
     fn precedence_conflict_greater_than() {
         expr_formats_same(indoc!(