fix(coverage): account if/else statements without brackets (#8608)

fix(coverage): recognize if/else statements without brackets

Author: grandizzy

crates/evm/coverage/src/analysis.rs

@@ -534,10 +534,23 @@ impl<'a> ContractVisitor<'a> {
     }
 }
 
-/// Helper function to check if a given node contains any statement.
+/// Helper function to check if a given node is or contains any statement.
 fn has_statements(node: &Node) -> bool {
-    let statements: Vec<Node> = node.attribute("statements").unwrap_or_default();
-    !statements.is_empty()
+    match node.node_type {
+        NodeType::DoWhileStatement |
+        NodeType::EmitStatement |
+        NodeType::ExpressionStatement |
+        NodeType::ForStatement |
+        NodeType::IfStatement |
+        NodeType::RevertStatement |
+        NodeType::TryStatement |
+        NodeType::VariableDeclarationStatement |
+        NodeType::WhileStatement => true,
+        _ => {
+            let statements: Vec<Node> = node.attribute("statements").unwrap_or_default();
+            !statements.is_empty()
+        }
+    }
 }
 
 /// [`SourceAnalyzer`] result type.

crates/forge/tests/cli/coverage.rs

@@ -1030,3 +1030,86 @@ contract FooTest is DSTest {
 "#]],
     );
 });
+
+// https://github.com/foundry-rs/foundry/issues/8605
+forgetest!(test_single_statement_coverage, |prj, cmd| {
+    prj.insert_ds_test();
+    prj.add_source(
+        "AContract.sol",
+        r#"
+contract AContract {
+    event IsTrue(bool isTrue);
+    event IsFalse(bool isFalse);
+
+    function ifElseStatementIgnored(bool flag) external {
+        if (flag) emit IsTrue(true);
+        else emit IsFalse(false);
+
+        if (flag) flag = true;
+        else flag = false;
+    }
+}
+    "#,
+    )
+    .unwrap();
+
+    prj.add_source(
+        "AContractTest.sol",
+        r#"
+import "./test.sol";
+import {AContract} from "./AContract.sol";
+
+contract AContractTest is DSTest {
+    function testTrueCoverage() external {
+        AContract a = new AContract();
+        a.ifElseStatementIgnored(true);
+    }
+
+    function testFalseCoverage() external {
+        AContract a = new AContract();
+        a.ifElseStatementIgnored(false);
+    }
+}
+    "#,
+    )
+    .unwrap();
+
+    // Assert 50% coverage for true branches.
+    cmd.arg("coverage")
+        .args(["--mt".to_string(), "testTrueCoverage".to_string()])
+        .assert_success()
+        .stdout_eq(str![[r#"
+...
+| File              | % Lines      | % Statements | % Branches   | % Funcs       |
+|-------------------|--------------|--------------|--------------|---------------|
+| src/AContract.sol | 50.00% (2/4) | 50.00% (2/4) | 50.00% (2/4) | 100.00% (1/1) |
+| Total             | 50.00% (2/4) | 50.00% (2/4) | 50.00% (2/4) | 100.00% (1/1) |
+
+"#]]);
+
+    // Assert 50% coverage for false branches.
+    cmd.forge_fuse()
+        .arg("coverage")
+        .args(["--mt".to_string(), "testFalseCoverage".to_string()])
+        .assert_success()
+        .stdout_eq(str![[r#"
+...
+| File              | % Lines       | % Statements | % Branches   | % Funcs       |
+|-------------------|---------------|--------------|--------------|---------------|
+| src/AContract.sol | 100.00% (4/4) | 50.00% (2/4) | 50.00% (2/4) | 100.00% (1/1) |
+| Total             | 100.00% (4/4) | 50.00% (2/4) | 50.00% (2/4) | 100.00% (1/1) |
+
+"#]]);
+
+    // Assert 100% coverage (true/false branches properly covered).
+    cmd.forge_fuse().arg("coverage").args(["--summary".to_string()]).assert_success().stdout_eq(
+        str![[r#"
+...
+| File              | % Lines       | % Statements  | % Branches    | % Funcs       |
+|-------------------|---------------|---------------|---------------|---------------|
+| src/AContract.sol | 100.00% (4/4) | 100.00% (4/4) | 100.00% (4/4) | 100.00% (1/1) |
+| Total             | 100.00% (4/4) | 100.00% (4/4) | 100.00% (4/4) | 100.00% (1/1) |
+
+"#]],
+    );
+});