RedundantBraces: keep braces if splice is $

scalameta · Nov 5, 2024 · a88e8d6 · a88e8d6
1 parent 1a73b75
commit a88e8d6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RedundantBraces.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/RedundantBraces.scala
@@ -342,7 +342,7 @@ class RedundantBraces(implicit val ftoks: FormatTokens)
       *     https://github.com/scalameta/scalafmt/issues/1420)
       */
     def canRemoveAroundName(name: String): Boolean = name.headOption.forall {
-      case '_' => false
+      case '_' | '$' => false
       case '`' => name.length <= 1 || name.last != '`'
       case _ => true
     }

diff --git a/scalafmt-tests/shared/src/test/resources/rewrite/RedundantBracesStrInterpolation.stat b/scalafmt-tests/shared/src/test/resources/rewrite/RedundantBracesStrInterpolation.stat
@@ -255,4 +255,4 @@ val content = {
 <<< #4456
 println(s"${$}")
 >>>
-println(s"$$")
+println(s"${$}")
diff --git a/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala b/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala
@@ -137,7 +137,7 @@ class FormatTests extends FunSuite with CanRunTests with FormatAssertions {
     val explored = Debug.explored.get()
     logger.debug(s"Total explored: $explored")
     if (!onlyUnit && !onlyManual)
-      assertEquals(explored, 1497767, "total explored")
+      assertEquals(explored, 1497775, "total explored")
     val results = debugResults.result()
     // TODO(olafur) don't block printing out test results.
     // I don't want to deal with scalaz's Tasks :'(