TreeOps: fix statement start for foo(func)

scalameta · May 15, 2022 · 0b40ad6 · 0b40ad6
1 parent 99d8a92
commit 0b40ad6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 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
@@ -93,7 +93,7 @@ class FormatOps(
 
   private[internal] val soft = new SoftKeywordClasses(dialect)
   private[internal] val statementStarts =
-    getStatementStarts(topSourceTree, tokens.after(_).left, soft)
+    getStatementStarts(topSourceTree, tokens, soft)
   // Maps token to number of non-whitespace bytes before the token's position.
   private final val nonWhitespaceOffset: Map[T, Int] = {
     val resultB = Map.newBuilder[T, Int]

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
@@ -28,7 +28,7 @@ import scala.reflect.ClassTag
 
 import org.scalafmt.Error
 import org.scalafmt.config.{DanglingParentheses, ScalafmtConfig}
-import org.scalafmt.internal.FormatToken
+import org.scalafmt.internal.{FormatToken, FormatTokens}
 
 /** Stateless helper functions on `scala.meta.Tree`.
   */
@@ -98,14 +98,14 @@ object TreeOps {
 
   def getStatementStarts(
       tree: Tree,
-      replacedWith: Token => Token,
+      ftoks: FormatTokens,
       soft: SoftKeywordClasses
   ): Map[TokenHash, Tree] = {
     val ret = Map.newBuilder[TokenHash, Tree]
     ret.sizeHint(tree.tokens.length)
 
     def addTok(token: Token, tree: Tree) =
-      ret += hash(replacedWith(token)) -> tree
+      ret += hash(ftoks.after(token).left) -> tree
     def addTree(t: Tree, tree: Tree) =
       t.tokens.find(!_.is[Trivia]).foreach(addTok(_, tree))
     def addAll(trees: Seq[Tree]) = trees.foreach(x => addTree(x, x))
@@ -168,7 +168,7 @@ object TreeOps {
         // special handling for rewritten blocks
         case t @ Term.Block(List(arg)) // single-stat block
             if t.tokens.headOption // see if opening brace was removed
-              .exists(x => x.is[Token.LeftBrace] && replacedWith(x).ne(x)) =>
+              .exists(x => x.is[Token.LeftBrace] && ftoks(x).left.ne(x)) =>
           if (arg.is[Term.Function]) {
             // handle rewritten apply { { x => b } } to a { x => b }
             val parentApply = findTreeWithParent(t) {
@@ -180,8 +180,10 @@ object TreeOps {
           }
         // special handling for rewritten apply(x => { b }) to a { x => b }
         case Term.Apply(_, List(f: Term.Function))
-            if subtree.tokens.lastOption // see if closing paren was moved
-              .exists(x => x.is[Token.RightParen] && replacedWith(x).ne(x)) =>
+            if subtree.tokens.lastOption.exists { x =>
+              x.is[Token.RightParen] && // see if closing paren is now brace
+              ftoks.prevNonComment(ftoks(x)).left.is[Token.RightBrace]
+            } =>
           addAll(Seq(f))
         case t => // Nothing
           addAll(extractStatementsIfAny(t))

diff --git a/scalafmt-tests/src/test/resources/rewrite/RedundantParens.stat b/scalafmt-tests/src/test/resources/rewrite/RedundantParens.stat
@@ -111,10 +111,8 @@ object a {
   (a(b => c))
 }
 >>>
-Idempotency violated
 object a {
-  a(
-  b => c)
+  a(b => c)
 }
 <<< single-arg apply of a block 1
 object a {