TreeOps: fix statement start for rewritten lambda

scalameta · Sep 29, 2021 · d33c573 · d33c573
1 parent 4e4e227
commit d33c573
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 38 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeOps.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeOps.scala
@@ -180,8 +180,8 @@ object TreeOps {
           }
         // special handling for rewritten apply(x => { b }) to a { x => b }
         case Term.Apply(_, List(f: Term.Function))
-            if f.tokens.lastOption // see if closing brace was moved
-              .exists(x => x.is[Token.RightBrace] && replacedWith(x).ne(x)) =>
+            if subtree.tokens.lastOption // see if closing paren was moved
+              .exists(x => x.is[Token.RightParen] && replacedWith(x).ne(x)) =>
           addAll(Seq(f))
         case t => // Nothing
           addAll(extractStatementsIfAny(t))

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat
@@ -1987,12 +1987,8 @@ object x:
     v + 1
   })
 >>>
-Idempotency violated
- object x:
--   val y = List(1).map(v =>
-+   val y = List(1).map(
-+   v =>
-       println(v)
--      v + 1
--   )
-+      v + 1)
+object x:
+   val y = List(1).map(v =>
+      println(v)
+      v + 1
+   )
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat
@@ -1936,12 +1936,8 @@ object x:
     v + 1
   })
 >>>
-Idempotency violated
- object x:
--   val y = List(1).map(v =>
-+   val y = List(1).map(
-+   v =>
-       println(v)
--      v + 1
--   )
-+      v + 1)
+object x:
+   val y = List(1).map(v =>
+      println(v)
+      v + 1
+   )
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat
@@ -2028,12 +2028,8 @@ object x:
     v + 1
   })
 >>>
-Idempotency violated
- object x:
--   val y = List(1).map(v =>
-+   val y = List(1).map(
-+   v =>
-       println(v)
--      v + 1
--   )
-+      v + 1)
+object x:
+   val y = List(1).map(v =>
+      println(v)
+      v + 1
+   )
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat
@@ -2146,12 +2146,8 @@ object x:
     v + 1
   })
 >>>
-Idempotency violated
- object x:
--   val y = List(1).map(v =>
-+   val y = List(1).map(
-+   v =>
-       println(v)
--      v + 1
--   )
-+      v + 1)
+object x:
+   val y = List(1).map(v =>
+      println(v)
+      v + 1
+   )