From ecfcca05a17873c4d8761aac50eb851713e0f71c Mon Sep 17 00:00:00 2001
From: grandizzy <38490174+grandizzy@users.noreply.github.com>
Date: Thu, 4 Apr 2024 13:33:28 +0300
Subject: [PATCH] fix(fmt): fix indent closing parenthesis enclosed in { }
 (#7557)

* fix(fmt): fix indent closing parenthesis enclosed in { }

* Fix testdata bad formatting
---
 crates/fmt/src/formatter.rs                         |  2 +-
 crates/fmt/testdata/Repros/fmt.sol                  | 12 ++++++++++++
 crates/fmt/testdata/Repros/original.sol             | 12 ++++++++++++
 testdata/default/cheats/RecordAccountAccesses.t.sol |  2 +-
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/crates/fmt/src/formatter.rs b/crates/fmt/src/formatter.rs
index bf69651003f6..d10cf4b38235 100644
--- a/crates/fmt/src/formatter.rs
+++ b/crates/fmt/src/formatter.rs
@@ -895,7 +895,7 @@ impl<'a, W: Write> Formatter<'a, W> {
                 write_chunk!(fmt, "{}", stringified.trim_start())
             })?;
             if !last.content.trim_start().is_empty() {
-                self.write_whitespace_separator(true)?;
+                self.indented(1, |fmt| fmt.write_whitespace_separator(true))?;
             }
             let last_chunk =
                 self.chunk_at(last.loc_before(), last.loc_next(), last.spaced, &last.content);
diff --git a/crates/fmt/testdata/Repros/fmt.sol b/crates/fmt/testdata/Repros/fmt.sol
index 8439563ab4e7..dc1ac24eb3a0 100644
--- a/crates/fmt/testdata/Repros/fmt.sol
+++ b/crates/fmt/testdata/Repros/fmt.sol
@@ -5,3 +5,15 @@ function errorIdentifier() {
     bytes memory error = bytes("");
     if (error.length > 0) {}
 }
+
+// https://github.com/foundry-rs/foundry/issues/7549
+function one() external {
+    this.other({
+        data: abi.encodeCall(
+            this.other,
+            (
+                "bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla"
+            )
+        )
+    });
+}
diff --git a/crates/fmt/testdata/Repros/original.sol b/crates/fmt/testdata/Repros/original.sol
index 8439563ab4e7..cee4fc97a6af 100644
--- a/crates/fmt/testdata/Repros/original.sol
+++ b/crates/fmt/testdata/Repros/original.sol
@@ -5,3 +5,15 @@ function errorIdentifier() {
     bytes memory error = bytes("");
     if (error.length > 0) {}
 }
+
+// https://github.com/foundry-rs/foundry/issues/7549
+function one() external {
+    this.other({
+        data: abi.encodeCall(
+            this.other,
+            (
+                "bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla"
+            )
+            )
+    });
+}
diff --git a/testdata/default/cheats/RecordAccountAccesses.t.sol b/testdata/default/cheats/RecordAccountAccesses.t.sol
index bea20570ae34..a0aa2cb5332d 100644
--- a/testdata/default/cheats/RecordAccountAccesses.t.sol
+++ b/testdata/default/cheats/RecordAccountAccesses.t.sol
@@ -943,7 +943,7 @@ contract RecordAccountAccessesTest is DSTest {
                 data: abi.encodeCall(
                     Create2or.create2,
                     (bytes32(0), abi.encodePacked(type(ConstructorStorer).creationCode, abi.encode(true)))
-                    ),
+                ),
                 reverted: false,
                 storageAccesses: new Vm.StorageAccess[](0),
                 depth: 1