FormatWriter: mind rewritten tokens for {} -> ()

scalameta · Mar 8, 2024 · fe1b10d · fe1b10d
1 parent 27f216e
commit fe1b10d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala
@@ -162,7 +162,7 @@ class FormatWriter(formatOps: FormatOps) {
           val ok = tok.meta.leftOwner match {
             case b: Term.Block =>
               checkApply(b) && RedundantBraces.canRewriteBlockWithParens(b) &&
-              b.parent.exists(_.tokens.last.start == rb.start)
+              b.parent.exists(tokens.getLast(_) eq tok)
             case f: Term.FunctionTerm =>
               checkApply(f) && RedundantBraces.canRewriteFuncWithParens(f)
             case t @ TreeOps.SingleArgInBraces(arg) =>

diff --git a/scalafmt-tests/src/test/resources/rewrite/RedundantParens.stat b/scalafmt-tests/src/test/resources/rewrite/RedundantParens.stat
@@ -1409,7 +1409,4 @@ rewrite.rules = [RedundantBraces, RedundantParens]
 ===
 foo.mtd({ x => x + 1 })
 >>>
-Idempotency violated
-=> Diff (- obtained, + expected)
--foo.mtd(x => x + 1)
-+foo.mtd { x => x + 1 }
+foo.mtd(x => x + 1)