FormatOps: find stmt starts after redundant parens

Fixes #2712.
scalameta · Aug 30, 2021 · 6a9ddaf · 6a9ddaf
1 parent fcb4f16
commit 6a9ddaf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 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
@@ -90,7 +90,7 @@ class FormatOps(
 
   private[internal] val soft = new SoftKeywordClasses(dialect)
   private[internal] val statementStarts =
-    getStatementStarts(topSourceTree, tokens(_).left, soft)
+    getStatementStarts(topSourceTree, tokens.after(_).left, soft)
   // Maps token to number of non-whitespace bytes before the token's position.
   private final val nonWhitespaceOffset: Map[Token, Int] = {
     val resultB = Map.newBuilder[Token, 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
@@ -103,7 +103,7 @@ object TreeOps {
     val ret = Map.newBuilder[TokenHash, Tree]
     ret.sizeHint(tree.tokens.length)
 
-    def addTok(token: Token, tree: Tree) = ret += hash(token) -> tree
+    def addTok(token: Token, tree: Tree) = ret += hash(replacedWith(token)) -> 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))

diff --git a/scalafmt-tests/src/test/resources/rewrite/RedundantParens.stat b/scalafmt-tests/src/test/resources/rewrite/RedundantParens.stat
@@ -751,11 +751,12 @@ class Toto() {
   }
 }
 >>>
-test does not parse
 class Toto() {
   private def myScalaFmtTest(): String = {
-    val test = new Toto "test"
-                      ^
+    val test = new Toto
+    "test"
+  }
+}
 <<< #2712 name
 class Toto() {
   private def myScalaFmtTest(): String = {
@@ -766,6 +767,7 @@ class Toto() {
 >>>
 class Toto() {
   private def myScalaFmtTest(): String = {
-    val test = new Toto a
+    val test = new Toto
+    a
   }
 }