Merge pull request #1618 from gontard/redundantsyntax_fix

Fix RedundantSyntax raw interpolator handling
scalacenter · Jun 11, 2022 · 57042bd · 57042bd
2 parents 59ed8c0 + 20dcbb1
commit 57042bd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/scalafix-rules/src/main/scala/scalafix/internal/rule/RedundantSyntax.scala b/scalafix-rules/src/main/scala/scalafix/internal/rule/RedundantSyntax.scala
@@ -35,8 +35,7 @@ class RedundantSyntax(config: RedundantSyntaxConfig)
             Nil
           )
           if config.stringInterpolator
-            && (p == "s" || p == "f" || (p == "raw" && StringContext
-              .processEscapes(v) == v)) =>
+            && (p == "s" || p == "f" || (p == "raw" && !v.contains('\\'))) =>
         Patch.removeTokens(interpolator.prefix.tokens)
     }.asPatch
 }
diff --git a/scalafix-tests/input/src/main/scala/test/redundantSyntax/StringInterpolator.scala b/scalafix-tests/input/src/main/scala/test/redundantSyntax/StringInterpolator.scala
@@ -27,6 +27,7 @@ class StringInterpolator {
   b = raw"foo $a \nbar"
   b = raw"foo\nbar\\"
   b = raw"foo bar"
+  b = raw"a\*b\+"
 
   b = my"foo"
   b = my"foo $a bar"

diff --git a/scalafix-tests/output/src/main/scala/test/redundantSyntax/StringInterpolator.scala b/scalafix-tests/output/src/main/scala/test/redundantSyntax/StringInterpolator.scala
@@ -22,11 +22,12 @@ class StringInterpolator {
   b = raw"foo $a \nbar"
   b = raw"foo\nbar\\"
   b = "foo bar"
+  b = raw"a\*b\+"
 
   b = my"foo"
   b = my"foo $a bar"
 
   implicit class MyInterpolator(sc: StringContext) {
     def my(subs: Any*): String = sc.toString + subs.mkString("")
   }
-}
+}