fix(fmt): apply multi statement block config to else block (foundry-r…

…s#8661) fix(fmt): apply multi statement block to else clauses
zhiqiangxu · Aug 13, 2024 · 224fe9c · 224fe9c
1 parent 1c71ab1
commit 224fe9c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/crates/fmt/src/formatter.rs b/crates/fmt/src/formatter.rs
@@ -1782,7 +1782,7 @@ impl<'a, W: Write> Formatter<'a, W> {
                 self.visit_if(*loc, cond, if_branch, else_branch, false)?;
             } else {
                 let else_branch_is_single_line =
-                    self.visit_stmt_as_block(else_branch, if_branch_is_single_line)?;
+                    self.visit_stmt_as_block(else_branch, attempt_single_line)?;
                 if single_line_stmt_wide && !else_branch_is_single_line {
                     bail!(FormatterError::fmt())
                 }

diff --git a/crates/fmt/testdata/Repros/fmt.sol b/crates/fmt/testdata/Repros/fmt.sol
@@ -131,3 +131,17 @@ library MyLib {
     );
     // forgefmt: disable-end
 }
+
+contract IfElseTest {
+    function setNumber(uint256 newNumber) public {
+        number = newNumber;
+        if (newNumber = 1) {
+            number = 1;
+        } else if (newNumber = 2) {
+            //            number = 2;
+        }
+        else {
+            newNumber = 3;
+        }
+    }
+}
diff --git a/crates/fmt/testdata/Repros/original.sol b/crates/fmt/testdata/Repros/original.sol
@@ -129,3 +129,17 @@ library MyLib {
     );
     // forgefmt: disable-end
 }
+
+contract IfElseTest {
+     function setNumber(uint256 newNumber) public {
+         number = newNumber;
+         if (newNumber = 1) {
+             number = 1;
+         } else if (newNumber = 2) {
+         //            number = 2;
+         }
+         else {
+             newNumber = 3;
+         }
+     }
+}