FormatOps: set indent correctly for enclosed body

scalameta · Jan 8, 2024 · e3360af · e3360af
1 parent 85c44dd
commit e3360af
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala
@@ -1904,7 +1904,13 @@ class FormatOps(
         style: ScalafmtConfig
     ): Split =
       asInfixApp(body).fold {
-        val expire = tokens.nextNonCommentSameLine(tokens.getLast(body)).left
+        val lastFt = tokens.getLast(body)
+        val right = nextNonComment(ft).right
+        val rpOpt = if (right.is[T.LeftParen]) matchingOpt(right) else None
+        val expireFt = rpOpt.fold(lastFt) { rp =>
+          if (rp.end >= lastFt.left.end) tokens.before(rp) else lastFt
+        }
+        val expire = tokens.nextNonCommentSameLine(expireFt).left
         nlSplit.withIndent(Num(style.indent.main), expire, ExpiresOn.After)
       }(app => InfixSplits.withNLIndent(nlSplit)(app, ft))
 

diff --git a/scalafmt-tests/src/test/resources/rewrite/RedundantParens.stat b/scalafmt-tests/src/test/resources/rewrite/RedundantParens.stat
@@ -1342,11 +1342,11 @@ object A {
   def test =
     (
       foo,
-  )
+    )
   def test =
     (
       foo,
-  )
+    )
   def test =
     (
       Option(""),
@@ -1373,11 +1373,11 @@ object A {
   def test =
     (
       foo,
-  )
+    )
   def test =
     (
       foo,
-  )
+    )
   def test =
     (
       Option(""),
@@ -1404,11 +1404,11 @@ object A {
   def test =
     (
       foo,
-  )
+    )
   def test =
     (
       foo,
-  )
+    )
   def test =
     (
       Option(""),