Merge pull request #2715 from kitbellew/2712

FormatOps: find stmt starts after redundant parens

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]

scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeOps.scala

@@ -103,7 +103,8 @@ 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))

scalafmt-tests/src/test/resources/rewrite/RedundantParens.stat

@@ -743,3 +743,31 @@ object Application {
 
   def main(args: Array[String]): Unit = app.run(args)
 }
+<<< #2712 literal
+class Toto() {
+  private def myScalaFmtTest(): String = {
+    val test = new Toto
+    ("test")
+  }
+}
+>>>
+class Toto() {
+  private def myScalaFmtTest(): String = {
+    val test = new Toto
+    "test"
+  }
+}
+<<< #2712 name
+class Toto() {
+  private def myScalaFmtTest(): String = {
+    val test = new Toto
+    (a)
+  }
+}
+>>>
+class Toto() {
+  private def myScalaFmtTest(): String = {
+    val test = new Toto
+    a
+  }
+}