From f11fb04c80e4d55caa85521c0ea5202512b285cc Mon Sep 17 00:00:00 2001
From: Jakub Ciesluk <323892@uwr.edu.pl>
Date: Tue, 5 Dec 2023 15:22:12 +0100
Subject: [PATCH] bugfix: Extension method completion with name conflict

---
 .../pc/completions/CompletionProvider.scala   |  4 +++
 .../pc/completions/CompletionValue.scala      |  2 ++
 .../pc/CompletionExtensionMethodSuite.scala   | 30 +++++++++++++++++++
 .../tests/pc/CompletionWorkspaceSuite.scala   | 25 ++++++++++++++++
 4 files changed, 61 insertions(+)

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
index 03318c82e8e..ea5c2c2ec1a 100644
--- 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.isExtensionMethod =>
+                  mkItem(
+                    ident.backticked(backtickSoftKeyword) + completionTextSuffix
+                  )
                 case _ =>
                   mkItem(
                     sym.fullNameBackticked(
diff --git a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionValue.scala b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionValue.scala
index 81e7fd15ee0..8f02ebd3bd0 100644
--- a/mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionValue.scala
+++ b/mtags/src/main/scala-3/scala/meta/internal/pc/completions/CompletionValue.scala
@@ -44,6 +44,7 @@ object CompletionValue:
     def symbol: Symbol
     def isFromWorkspace: Boolean = false
     def completionItemDataKind = CompletionItemData.None
+    def isExtensionMethod: Boolean = false
 
     override def completionData(
         buildTargetIdentifier: String
@@ -125,6 +126,7 @@ object CompletionValue:
   ) extends Symbolic:
     override def completionItemKind(using Context): CompletionItemKind =
       CompletionItemKind.Method
+    override def isExtensionMethod: Boolean = true
     override def description(printer: MetalsPrinter)(using Context): String =
       s"${printer.completionSymbol(symbol)} (extension)"
 
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionExtensionMethodSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionExtensionMethodSuite.scala
index 1fdda5fb12e..c75c9b433fb 100644
--- 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(
diff --git a/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala
index 34f4d95bf43..754a01bc405 100644
--- a/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala
+++ b/tests/cross/src/test/scala/tests/pc/CompletionWorkspaceSuite.scala
@@ -988,4 +988,29 @@ class CompletionWorkspaceSuite extends BaseCompletionSuite {
        |MyType - demo.other""".stripMargin
   )
 
+  checkEdit(
+    "method-name-conflict".tag(IgnoreScala2),
+    """|package demo
+       |
+       |object O {
+       |  def mmmm(x: Int) = x + 3
+       |  class Test {
+       |    val mmmm = "abc"
+       |    val foo = mmmm@@
+       |  }
+       |}
+       |""".stripMargin,
+    """|package demo
+       |
+       |object O {
+       |  def mmmm(x: Int) = x + 3
+       |  class Test {
+       |    val mmmm = "abc"
+       |    val foo = demo.O.mmmm($0)
+       |  }
+       |}
+       |""".stripMargin,
+    filter = _.contains("mmmm(x: Int)")
+  )
+
 }