fix(fmt): properly handle multiline_func_header = "all" + bump alloy (foundry-rs#12110)

* fix: don't normalize single-line non-doc block cmnts

* fix: preserve consecutive whitespaces

* fix: use byte length instead of char count

* fix(fmt): properly handle multiline_func_header = "all"

* fix: bump alloy

* fix: bump alloy

Author: 0xrusowsky

Cargo.lock

@@ -249,7 +249,7 @@ alloy-hardforks = { version = "0.3.2", default-features = false }
 alloy-op-hardforks = { version = "0.3.2", default-features = false }
 
 ## alloy-core
-alloy-dyn-abi = "1.3.1"
+alloy-dyn-abi = "1.4.1"
 alloy-json-abi = "1.3.0"
 alloy-primitives = { version = "1.3.1", features = [
     "getrandom",

Cargo.toml

@@ -461,6 +461,11 @@ impl<'ast> State<'_, 'ast> {
         let header_style = self.config.multiline_func_header;
         let params_format = match header_style {
             MultilineFuncHeaderStyle::ParamsFirst => ListFormat::always_break(),
+            MultilineFuncHeaderStyle::All
+                if header.parameters.len() > 1 && !self.can_header_be_inlined(header) =>
+            {
+                ListFormat::always_break()
+            }
             MultilineFuncHeaderStyle::AllParams
                 if !header.parameters.is_empty() && !self.can_header_be_inlined(header) =>
             {
@@ -2433,6 +2438,8 @@ impl<'ast> State<'_, 'ast> {
     }
 
     fn can_header_be_inlined(&mut self, header: &ast::FunctionHeader<'_>) -> bool {
+        const FUNCTION: usize = 8;
+
         // ' ' + visibility
         let visibility = header.visibility.map_or(0, |v| self.estimate_size(v.span) + 1);
         // ' ' + state mutability
@@ -2449,7 +2456,8 @@ impl<'ast> State<'_, 'ast> {
                 .fold(0, |len, p| if len != 0 { len + 2 } else { 8 } + self.estimate_size(p.span))
         });
 
-        self.estimate_header_params_size(header)
+        FUNCTION
+            + self.estimate_header_params_size(header)
             + visibility
             + mutability
             + modifiers

crates/fmt/src/state/sol.rs

@@ -727,7 +727,10 @@ contract FunctionOverrides is
         a = 1;
     }
 
-    function simple(address _target, bytes memory _payload)
+    function simple(
+        address _target,
+        bytes memory _payload
+    )
         internal
     {
         a = 1;

crates/fmt/testdata/FunctionDefinition/all.fmt.sol

@@ -0,0 +1,15 @@
+// config: line_length = 120
+// config: multiline_func_header = "all"
+contract Repros {
+    // https://github.com/foundry-rs/foundry/issues/12109
+    function calculateStreamedPercentage(
+        uint128 streamedAmount,
+        uint128 depositedAmount
+    )
+        internal
+        pure
+        returns (uint256)
+    {
+        a = 1;
+    }
+}

crates/fmt/testdata/ReprosFunctionDefs/all.120.fmt.sol

@@ -0,0 +1,4 @@
+contract Repros {
+    // https://github.com/foundry-rs/foundry/issues/12109
+    function calculateStreamedPercentage(uint128 streamedAmount, uint128 depositedAmount) internal pure returns (uint256) { a = 1; }
+}

crates/fmt/testdata/ReprosFunctionDefs/original.sol

@@ -202,6 +202,7 @@ fmt_tests! {
     PragmaDirective,
     Repros,
     ReprosCalls,
+    ReprosFunctionDefs,
     ReturnStatement,
     RevertNamedArgsStatement,
     RevertStatement,