bugfix: No signature help for local methods

[Cherry-picked 0fd88ee]
scala · Jun 19, 2024 · 54b9397 · 54b9397
1 parent b190627
commit 54b9397
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/util/Signatures.scala b/compiler/src/dotty/tools/dotc/util/Signatures.scala
@@ -13,6 +13,7 @@ import core.NameKinds
 import core.Types._
 import core.Symbols.NoSymbol
 import interactive.Interactive
+import transform.SymUtils.isLocalToBlock
 import util.Spans.Span
 import reporting._
 
@@ -178,7 +179,8 @@ object Signatures {
         (alternativeIndex, alternatives)
       case _ =>
         val funSymbol = fun.symbol
-        val alternatives = funSymbol.owner.info.member(funSymbol.name).alternatives
+        val alternatives = if funSymbol.isLocalToBlock then List(funSymbol.denot) else
+          funSymbol.owner.info.member(funSymbol.name).alternatives
         val alternativeIndex = alternatives.map(_.symbol).indexOf(funSymbol) max 0
         (alternativeIndex, alternatives)
 

diff --git a/presentation-compiler/test/dotty/tools/pc/tests/signaturehelp/SignatureHelpSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/signaturehelp/SignatureHelpSuite.scala
@@ -702,3 +702,58 @@ class SignatureHelpSuite extends BaseSignatureHelpSuite:
          |                       ^^^^^^^^^^^
          |""".stripMargin
     )
+
+  @Test def `local-method` = 
+    check(
+      """
+        |object Main {
+        |  def foo() = {
+        |    def deployment(
+        |      fst: String,
+        |      snd: Int = 1,
+        |    ): Option[Int] = ???
+        |    val abc = deployment(@@)
+        |  }
+        |}
+        |""".stripMargin,
+      """|deployment(fst: String, snd: Int): Option[Int]
+         |           ^^^^^^^^^^^
+         |""".stripMargin,
+    )
+
+  @Test def `local-method2` = 
+      check(
+        """
+          |object Main {
+          |  val foo = {
+          |    def deployment(
+          |      fst: String,
+          |      snd: Int = 1,
+          |    ): Option[Int] = ???
+          |    deployment(@@)
+          |  }
+          |}
+          |""".stripMargin,
+        """|deployment(fst: String, snd: Int): Option[Int]
+           |           ^^^^^^^^^^^
+           |""".stripMargin,
+      )
+
+  @Test def `local-method3` = 
+    check(
+      """
+        |object Main {
+        |  def foo = {
+        |    object a {
+        |      def apply(a: Int): Int = a
+        |      def apply(b: String): String = b
+        |      a(""@@)
+        |    }
+        |  }
+        |}
+        |""".stripMargin,
+      """|apply(b: String): String
+         |      ^^^^^^^^^
+         |apply(a: Int): Int
+         |""".stripMargin
+    )