fix(fmt): rustfmt-like blank lines in stmt blocks (#11914)

Author: 0xrusowsky

crates/fmt/src/state/common.rs

@@ -529,18 +529,21 @@ impl<'ast> State<'_, 'ast> {
             BlockFormat::NoBraces(Some(offset)) => {
                 let enabled =
                     !self.inline_config.is_disabled(Span::new(block_lo, block_lo + BytePos(1)))
-                        && !self.handle_span(self.cursor.span(block_lo), false);
-                match self.peek_comment_before(block_lo).map(|cmnt| (cmnt.span, cmnt.style)) {
+                        && !self.handle_span(self.cursor.span(block_lo), true);
+                match self.peek_comment().and_then(|cmnt| {
+                    if cmnt.span.hi() < block_lo { Some((cmnt.span, cmnt.style)) } else { None }
+                }) {
                     Some((span, style)) => {
                         if enabled {
                             // Inline config is not disabled and span not handled
                             if !self.inline_config.is_disabled(span) || style.is_isolated() {
                                 self.cursor.advance_to(span.lo(), true);
                                 self.break_offset(SIZE_INFINITY as usize, offset);
                             }
-                            if let Some(cmnt) = self
-                                .print_comments(block_lo, CommentConfig::default().offset(offset))
-                                && !cmnt.is_mixed()
+                            if let Some(cmnt) = self.print_comments(
+                                block_lo,
+                                CommentConfig::skip_leading_ws(false).offset(offset),
+                            ) && !cmnt.is_mixed()
                                 && !cmnt.is_blank()
                             {
                                 self.s.offset(offset);

crates/fmt/testdata/Repros/fmt.sol

@@ -182,6 +182,15 @@ function noBlanksLinesBeforeIdentifiers() public {
     timelockController.grantRole(keccak256("EXECUTOR_ROLE"), address(0));
 }
 
+// https://github.com/foundry-rs/foundry/issues/11913
+function rustfmtBlankLinesInStmtBlocks() public {
+    if (someCondition) {
+        bar = true;
+
+        emit Foo(bar);
+    }
+}
+
 contract NestedCallsTest is Test {
     string constant errMsg = "User provided message";
     uint256 constant maxDecimals = 77;

crates/fmt/testdata/Repros/original.sol

@@ -187,6 +187,22 @@ function noBlanksLinesBeforeIdentifiers() public {
         .grantRole(keccak256("EXECUTOR_ROLE"), address(0));
 }
 
+// https://github.com/foundry-rs/foundry/issues/11913
+function rustfmtBlankLinesInStmtBlocks() public {
+        if (someCondition) {
+
+
+
+    bar = true;
+
+
+
+            emit Foo(bar);
+
+
+            }
+}
+
 contract NestedCallsTest is Test {
     string constant errMsg = "User provided message";
     uint256 constant maxDecimals = 77;

crates/fmt/testdata/Repros/sorted.fmt.sol

@@ -183,6 +183,15 @@ function noBlanksLinesBeforeIdentifiers() public {
     timelockController.grantRole(keccak256("EXECUTOR_ROLE"), address(0));
 }
 
+// https://github.com/foundry-rs/foundry/issues/11913
+function rustfmtBlankLinesInStmtBlocks() public {
+    if (someCondition) {
+        bar = true;
+
+        emit Foo(bar);
+    }
+}
+
 contract NestedCallsTest is Test {
     string constant errMsg = "User provided message";
     uint256 constant maxDecimals = 77;

crates/fmt/testdata/Repros/tab.fmt.sol

@@ -183,6 +183,15 @@ function noBlanksLinesBeforeIdentifiers() public {
 	timelockController.grantRole(keccak256("EXECUTOR_ROLE"), address(0));
 }
 
+// https://github.com/foundry-rs/foundry/issues/11913
+function rustfmtBlankLinesInStmtBlocks() public {
+	if (someCondition) {
+		bar = true;
+
+		emit Foo(bar);
+	}
+}
+
 contract NestedCallsTest is Test {
 	string constant errMsg = "User provided message";
 	uint256 constant maxDecimals = 77;