fix: Go to definition for named constructor params

scalameta · Aug 17, 2023 · 61c5c41 · 61c5c41
1 parent b7f370e
commit 61c5c41
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 4 deletions.
diff --git a/mtags/src/main/scala/scala/meta/internal/mtags/DefinitionAlternatives.scala b/mtags/src/main/scala/scala/meta/internal/mtags/DefinitionAlternatives.scala
@@ -12,6 +12,7 @@ object DefinitionAlternatives {
       caseClassCompanionToType(symbol),
       caseClassApplyOrCopy(symbol),
       caseClassApplyOrCopyParams(symbol),
+      initParamToValue(symbol),
       varGetter(symbol),
       methodOwner(symbol),
       objectInsteadOfAny(symbol)
@@ -47,6 +48,22 @@ object DefinitionAlternatives {
     }
   }
 
+  private def initParamToValue(symbol: Symbol): Option[Symbol] = {
+    Option(symbol).collect {
+      case GlobalSymbol(
+            GlobalSymbol(
+              GlobalSymbol(owner, signature),
+              Descriptor.Method("<init>", _)
+            ),
+            Descriptor.Parameter(param)
+          ) =>
+        GlobalSymbol(
+          GlobalSymbol(owner, Descriptor.Type(signature.name.value)),
+          Descriptor.Term(param)
+        )
+    }
+  }
+
   /**
    * If `case class Foo(a: Int)`, then resolve
    * `a` in `Foo.apply(a = 1)`, and

diff --git a/tests/unit/src/test/resources/definition-scala3/example/NamedArguments.scala b/tests/unit/src/test/resources/definition-scala3/example/NamedArguments.scala
@@ -22,8 +22,8 @@ object NamedArguments/*NamedArguments.scala*/ {
 
   // anonymous classes
   @deprecated/*deprecated.scala*/(
-    message/*deprecated.scala fallback to scala.deprecated#*/ = "a",
-    since/*deprecated.scala fallback to scala.deprecated#*/ = susan/*NamedArguments.scala*/,/*unexpected: example.NamedArguments.susan.*/
+    message/*deprecated.scala fallback to scala.deprecated#message.*/ = "a",
+    since/*deprecated.scala fallback to scala.deprecated#since.*/ = susan/*NamedArguments.scala*/,/*unexpected: example.NamedArguments.susan.*/
   ) def b/*NamedArguments.scala*/ = 1
 
   // vararg

diff --git a/tests/unit/src/test/resources/definition/example/NamedArguments.scala b/tests/unit/src/test/resources/definition/example/NamedArguments.scala
@@ -22,8 +22,8 @@ object NamedArguments/*NamedArguments.scala*/ {
 
   // anonymous classes
   @deprecated/*deprecated.scala*/(
-    message/*deprecated.scala fallback to scala.deprecated#*/ = "a",
-    since/*deprecated.scala fallback to scala.deprecated#*/ = susan/*NamedArguments.scala*/,
+    message/*deprecated.scala fallback to scala.deprecated#message.*/ = "a",
+    since/*deprecated.scala fallback to scala.deprecated#since.*/ = susan/*NamedArguments.scala*/,
   ) def b/*NamedArguments.scala*/ = 1
 
   // vararg

diff --git a/tests/unit/src/test/scala/tests/DefinitionLspSuite.scala b/tests/unit/src/test/scala/tests/DefinitionLspSuite.scala
@@ -571,4 +571,39 @@ class DefinitionLspSuite extends BaseLspSuite("definition") {
       }
     }
 
+  test("init-args") {
+    for {
+      _ <- initialize(
+        """
+          |/metals.json
+          |{
+          |  "a": { }
+          |}
+          |/a/src/main/scala/a/Main.scala
+          |class A(
+          |  a: Int, 
+          |  b: Int
+          |) {}
+          |object Main {
+          |  val aa = new A(a = 1, b = 2)
+          |}
+          |""".stripMargin
+      )
+      _ = client.messageRequests.clear()
+      _ <- server.didOpen("a/src/main/scala/a/Main.scala")
+      _ = assertNoDiff(
+        server.workspaceDefinitions,
+        """|/a/src/main/scala/a/Main.scala
+           |class A/*L0*/(
+           |  a/*L1*/: Int/*Int.scala*/, 
+           |  b/*L2*/: Int/*Int.scala*/
+           |) {}
+           |object Main/*L4*/ {
+           |  val aa/*L5*/ = new A/*L0*/(a/*L1*/ = 1, b/*L2*/ = 2)
+           |}
+           |""".stripMargin,
+      )
+    } yield ()
+  }
+
 }