better support of backquoted identifiers in SymbolMatcher

scalacenter · Nov 6, 2023 · 515388d · 515388d
1 parent 3f44fad
commit 515388d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/scalafix-core/src/main/scala/scalafix/internal/util/SymbolOps.scala b/scalafix-core/src/main/scala/scalafix/internal/util/SymbolOps.scala
@@ -98,7 +98,10 @@ object SymbolOps {
   }
 
   def inferTrailingDot(symbol: String): String =
-    if (symbol.isEmpty) symbol
-    else if (Character.isJavaIdentifierPart(symbol.last)) symbol + "."
-    else symbol
+    if (symbol.isEmpty)
+      symbol
+    else if (Character.isJavaIdentifierPart(symbol.last) || symbol.last == '`')
+      symbol + "."
+    else
+      symbol
 }
diff --git a/scalafix-tests/integration/src/test/scala/scalafix/tests/v1/SymbolMatcherSuite.scala b/scalafix-tests/integration/src/test/scala/scalafix/tests/v1/SymbolMatcherSuite.scala
@@ -46,6 +46,15 @@ class SymbolMatcherSuite extends AnyFunSuite {
       assert(map.matches(Symbol("scala/Option#map(+1).")), sym)
       assert(map.matches(Symbol("scala/Option.map(+1).")), sym)
     }
+
+    List(
+      "scala.Int.`+`",
+      "scala.Int.`+`#",
+      "scala.Int.`+`."
+    ).foreach { sym =>
+      val option = SymbolMatcher.normalized(sym)
+      assert(option.matches(Symbol("scala/Int#`+`(+4).")), sym)
+    }
   }
 
   test("matches/unapply") {