Merge pull request #15021 from dotty-staging/scaladoc/extension-methods-fix

Scaladoc: Fix implicit members resolution

Author: pikinier20

scaladoc-testcases/src/tests/implicitMembers.scala

@@ -3,18 +3,13 @@ package tests
 package implicitMembers
 
 class OuterClass:
-  class ImplicitMemberTarget
 
+  class ImplicitMemberTarget
   object ImplicitMemberTarget:
-    extension (a: ImplicitMemberTarget)
-      def extensionFromCompanion: String =
-        "ImplicitMemberTarget"
-
-  // does not work
-  extension (a: ImplicitMemberTarget)
-    def extensionFromOuterClass: String =
-      "ImplicitMemberTarget"
+    extension (a: ImplicitMemberTarget) def extensionFromCompanion(i: Int): String//expected: def extensionFromCompanion(i: Int): String
+      = "ImplicitMemberTarget"
+  extension (a: ImplicitMemberTarget) def extensionFromOuterClass(i: Int): String//expected: def extensionFromOuterClass(i: Int): String
+   = "ImplicitMemberTarget"
 
-extension (a: OuterClass#ImplicitMemberTarget)
-    def extensionFromPackage: String =
-      "ImplicitMemberTarget"
+extension (a: OuterClass#ImplicitMemberTarget) def extensionFromPackage(i: Int): String//expected: def extensionFromPackage(i: Int): String
+  =  "ImplicitMemberTarget"

scaladoc/src/dotty/tools/scaladoc/transformers/ImplicitMembersExtensionTransformer.scala

@@ -28,7 +28,7 @@ class ImplicitMembersExtensionTransformer(using DocContext) extends(Module => Mo
       def collectApplicableMembers(source: Member): Seq[Member] = source.members.flatMap {
         case m @ Member(_, _, _, Kind.Extension(ExtensionTarget(_, _, _, _, MyDri, _), _), Origin.RegularlyDefined) =>
           val kind = m.kind match
-            case d: Kind.Def => d
+            case Kind.Extension(_, d) => d
             case _ => Kind.Def(Nil, Nil)
 
           Seq(m.withOrigin(Origin.ExtensionFrom(source.name, source.dri)).withKind(kind))
@@ -44,12 +44,12 @@ class ImplicitMembersExtensionTransformer(using DocContext) extends(Module => Mo
               }
             case _ =>
               Nil
-        case _ =>
+        case other =>
           None
       }
 
       val newImplicitMembers = implictSources.flatMap(collectApplicableMembers).distinct
-      val expandedMembers = c.members.map(expandMember(newImplicitMembers ++ Seq(c)))
+      val expandedMembers = c.members.map(expandMember(outerMembers ++ Seq(c)))
       c.withMembers(newImplicitMembers ++ expandedMembers)
 
     original.updatePackages(_.map(expandMember(Nil)(_)))

scaladoc/test/dotty/tools/scaladoc/signatures/TranslatableSignaturesTestCases.scala

@@ -98,3 +98,9 @@ class ContextFunctions extends SignatureTest("contextfunctions", SignatureTest.a
 class MarkdownCode extends SignatureTest("markdowncode", SignatureTest.all)
 
 class FunctionTypeSignatures extends SignatureTest("functionTypeSignatures", SignatureTest.all)
+
+class ImplicitMembers extends SignatureTest(
+  "implicitMembers",
+  Seq("def"),
+  filterFunc = _.toString.endsWith("OuterClass$ImplicitMemberTarget.html")
+)