Better self type prefixes in scaladoc

Author: KacperFKorban

scaladoc-testcases/src/tests/selftypes.scala

@@ -3,6 +3,12 @@ package tests.selftypes
 class A:
   def a: Unit = ???
 
+class C
+
+class HasAnAndSelfType:
+  self: A & C =>
+  def b: Unit = ???
+
 class HasASelfType:
   self: A =>
   def b: Unit = ???

scaladoc/src/dotty/tools/scaladoc/api.scala

@@ -69,6 +69,7 @@ enum Kind(val name: String){
     extends Kind("given") with ImplicitConversionProvider
   case Implicit(kind: Kind.Def | Kind.Val.type, conversion: Option[ImplicitConversion])
     extends Kind(kind.name)  with ImplicitConversionProvider
+  case SelfType(selfName: String) extends Kind("self")
   case Unknown extends Kind("Unknown")
 }
 

scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala

@@ -349,9 +349,18 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
           div(link.kind.name," ", link.signature.map(renderElement))
         )))
 
+      def selfTypeList(list: List[LinkToType]): Seq[AppliedTag] =
+        if list.isEmpty then Nil
+        else Seq(div(cls := "symbol monospace") { list.map {
+          case link if link.kind.isInstanceOf[Kind.SelfType] =>
+            div(link.kind.asInstanceOf[Kind.SelfType].selfName, ": ", link.signature.map(renderElement))
+          case link =>
+            div("self: ", link.signature.map(renderElement))
+        }})
+
       val supertypes = signatureList(m.parents)
       val subtypes = signatureList(m.knownChildren)
-      val selfType = signatureList(m.selfType.toSeq)
+      val selfType = selfTypeList(m.selfType.toList)
 
       renderTabs(
         singleSelection = true,

scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala

@@ -85,7 +85,7 @@ trait ClassLikeSupport:
     val selfType = classDef.self.map { (valdef: ValDef) =>
       val symbol = valdef.symbol
       val tpe = valdef.tpt.tpe
-      LinkToType(tpe.asSignature, symbol.dri, bareClasslikeKind(symbol))
+      LinkToType(tpe.asSignature, symbol.dri, Kind.SelfType(valdef.name))
     }
     val selfSignature: DSignature = typeForClass(classDef).asSignature
 

scaladoc/src/dotty/tools/scaladoc/translators/ScalaSignatureProvider.scala

@@ -38,7 +38,7 @@ object ScalaSignatureProvider:
         builder.text("package ").name(documentable.name, documentable.dri)
       case Kind.RootPackage =>
         builder
-      case Kind.Unknown =>
+      case Kind.Unknown | _: Kind.SelfType =>
         ???
 
   private def enumEntrySignature(member: Member, cls: Kind.Class, bdr: SignatureBuilder): SignatureBuilder =