bugfix: Extension method completion with name conflict

scalameta · Dec 5, 2023 · f4fdc6a · f4fdc6a
1 parent 1870e89
commit f4fdc6a
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionProvider.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionProvider.scala
@@ -261,6 +261,10 @@ class CompletionProvider(
                   mkItem(
                     "{" + sym.fullNameBackticked + completionTextSuffix + "}"
                   )
+                case _ if v.completionItemKind == CompletionItemKind.Method =>
+                  mkItem(
+                    ident.backticked(backtickSoftKeyword) + completionTextSuffix
+                  )
                 case _ =>
                   mkItem(
                     sym.fullNameBackticked(

diff --git a/tests/cross/src/test/scala/tests/pc/CompletionExtensionMethodSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionExtensionMethodSuite.scala
@@ -130,6 +130,36 @@ class CompletionExtensionMethodSuite extends BaseCompletionSuite {
        |""".stripMargin
   )
 
+  checkEdit(
+    "name-conflict",
+    """|package example
+       |
+       |import example.enrichments.*
+       |
+       |object enrichments:
+       |  extension (num: Int)
+       |    def plus(other: Int): Int = num + other
+       |
+       |def main = {
+       |  val plus = 100.plus(19)
+       |  val y = 19.pl@@
+       |}
+       |""".stripMargin,
+    """|package example
+       |
+       |import example.enrichments.*
+       |
+       |object enrichments:
+       |  extension (num: Int)
+       |    def plus(other: Int): Int = num + other
+       |
+       |def main = {
+       |  val plus = 100.plus(19)
+       |  val y = 19.plus($0)
+       |}
+       |""".stripMargin
+  )
+
   // NOTE: In 3.1.3, package object name includes the whole path to file
   // eg. in 3.2.2 we get `A$package`, but in 3.1.3 `/some/path/to/file/A$package`
   check(