Let statement should rewrite rhs with comments after equal sign

Author: johnhuichen

.gitignore

@@ -23,3 +23,6 @@ tests/cargo-fmt/**/target
 .idea/
 .vscode/
 *~
+
+# Git
+.git/

src/items.rs

@@ -131,14 +131,23 @@ impl Rewrite for ast::Local {
                 .sub_width(1)
                 .max_width_error(shape.width, self.span())?;
 
-            result = rewrite_assign_rhs(
+            // should always find a comment span
+            let comment_span = context
+                .snippet_provider
+                .opt_span_after(self.span, "=")
+                .map(|op_lo| mk_sp(op_lo, init.span.lo()))
+                .unwrap();
+
+            result = rewrite_assign_rhs_with_comments(
                 context,
                 result,
                 init,
-                &RhsAssignKind::Expr(&init.kind, init.span),
                 nested_shape,
-            )
-            .max_width_error(shape.width, self.span())?;
+                &RhsAssignKind::Expr(&init.kind, init.span),
+                RhsTactics::Default,
+                comment_span,
+                true,
+            )?;
 
             if let Some(block) = else_block {
                 let else_kw_span = init.span.between(block.span);

tests/source/issue-6246.rs

@@ -0,0 +1,20 @@
+fn main() {
+    let foo = 
+    // 114514
+    if true {
+        1919
+    } else {
+        810
+    };
+}
+
+// Test a let statement without equal sign
+fn main() {
+    let mut foo ;
+    // 114514
+    foo = if true {
+        1919
+    } else {
+        810
+    };
+}

tests/target/issue-6246.rs

@@ -0,0 +1,12 @@
+fn main() {
+    let foo =
+        // 114514
+        if true { 1919 } else { 810 };
+}
+
+// Test a let statement without equal sign
+fn main() {
+    let mut foo;
+    // 114514
+    foo = if true { 1919 } else { 810 };
+}