Extension method groupping fix. CRs from PR #10306

Author: pikinier20

scala3doc/src/dotty/dokka/model/api/api.scala

@@ -49,7 +49,7 @@ enum Modifier(val name: String, val prefix: Boolean):
   case Opaque extends Modifier("opaque", true)
   case Open extends Modifier("open", true)
 
-case class ExtensionTarget(name: String, signature: Signature, dri: DRI)
+case class ExtensionTarget(name: String, signature: Signature, dri: DRI, position: Long)
 case class ImplicitConversion(from: DRI, to: DRI)
 trait ImplicitConversionProvider { def conversion: Option[ImplicitConversion] }
 trait Classlike

scala3doc/src/dotty/dokka/tasty/ClassLikeSupport.scala

@@ -109,7 +109,12 @@ trait ClassLikeSupport:
   private def parseMember(s: Tree): Option[Member] = processTreeOpt(s)(s match
       case dd: DefDef if !dd.symbol.isHiddenByVisibility && !dd.symbol.isSyntheticFunc && dd.symbol.isExtensionMethod =>
         dd.symbol.extendedSymbol.map { extSym =>
-          val target = ExtensionTarget(extSym.symbol.normalizedName, extSym.tpt.dokkaType.asSignature, extSym.tpt.symbol.dri)
+          val target = ExtensionTarget(
+            extSym.symbol.normalizedName, 
+            extSym.tpt.dokkaType.asSignature, 
+            extSym.tpt.symbol.dri, 
+            extSym.symbol.pos.start
+          )
           parseMethod(dd.symbol, kind = Kind.Extension(target))
         }
       // TODO check given methods?

scala3doc/src/dotty/dokka/tasty/TastyParser.scala

@@ -168,7 +168,7 @@ case class TastyParser(qctx: QuoteContext, inspector: DokkaBaseTastyInspector, c
 
   private def errorMsg[T](a: Any, m: => String, e: Throwable): Option[T] =
     val msg = try m catch case e: Throwable => a.toString
-    println(s"ERROR: tree is faling: msg")
+    println(s"ERROR: tree is faling: $msg")
     e.printStackTrace()
     throw e
 

scala3doc/src/dotty/dokka/transformers/ImplicitMembersExtensionTransformer.scala

@@ -14,18 +14,25 @@ import dotty.dokka.model.api._
 class ImplicitMembersExtensionTransformer(ctx: DokkaContext) extends DocumentableTransformer:
   override def invoke(original: DModule, context: DokkaContext): DModule =
     val classlikeMap = original.driMap
+    val logger = context.getLogger
 
-    def expandMember(outerMembers: Seq[Member])(c: Member): Member =
-      val companion = c match
-        case classlike: DClass => ClasslikeExtension.getFrom(classlike).flatMap(_.companion).flatMap(classlikeMap.get)
+    def retrieveCompanion(m: Member) = m match {
+        case classlike: DClass => 
+          val comp = ClasslikeExtension.getFrom(classlike).flatMap(_.companion)
+          comp.flatMap { dri =>
+            val res = classlikeMap.get(dri)
+            if res.isEmpty then logger.warn(s"Companion for class ${classlike.name} exists but is missing in classlike map")
+            res
+          }
         case _ => None
+    }
+
+    def expandMember(outerMembers: Seq[Member])(c: Member): Member =
+      val companion = retrieveCompanion(c)
 
       val allParents = c.parents.flatMap(p => classlikeMap.get(p.dri))
 
-      val parentCompanions = allParents.flatMap {
-          case cls: DClasslike => ClasslikeExtension.getFrom(cls).flatMap(_.companion).flatMap(classlikeMap.get)
-          case _ => None
-      }
+      val parentCompanions = allParents.flatMap(retrieveCompanion)
 
       // TODO (#220): We can expand this on generic etc
       val implictSources = outerMembers ++ companion.toSeq ++ parentCompanions
@@ -34,7 +41,7 @@ class ImplicitMembersExtensionTransformer(ctx: DokkaContext) extends Documentabl
 
       val MyDri = c.getDri
       def collectApplicableMembers(source: Member): Seq[Member] = source.allMembers.flatMap {
-        case m @ Member(_, _, _, Kind.Extension(ExtensionTarget(_, _, MyDri)), Origin.DefinedWithin) =>
+        case m @ Member(_, _, _, Kind.Extension(ExtensionTarget(_, _, MyDri, _)), Origin.DefinedWithin) =>
           Seq(m.withOrigin(Origin.ExtensionFrom(source.name, source.dri)).withKind(Kind.Def))
         case m @ Member(_, _, _, conversionProvider: ImplicitConversionProvider, Origin.DefinedWithin) =>
           conversionProvider.conversion match

scala3doc/src/dotty/dokka/translators/ScalaSignatureProvider.scala

@@ -31,12 +31,12 @@ class ScalaSignatureProvider(contentConverter: CommentsToContentConverter, logge
     def driLink(text: String, dri: DRI): SignatureBuilder = ContentNodeBuilder(builder.driLink(text, dri))
   }
 
-  def signature(d: Documentable, s: Signature) = signatureContent(d){ builder => 
+  def signature(d: Member, s: Signature) = signatureContent(d){ builder => 
     val res = ContentNodeBuilder(builder).signature(s)
     res.asInstanceOf[ContentNodeBuilder].builder
   }
 
-  override def signature(documentable: Documentable) =
+  override def signature(documentable: Member) =
     JList(signatureContent(documentable){ builder =>
       val withAnnotations = ContentNodeBuilder(builder).annotationsBlock(documentable)
       val res = ScalaSignatureProvider.rawSignature(documentable, withAnnotations)