Refactor Kind.Def to use one paramLists

Author: Sporarum

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

@@ -61,7 +61,7 @@ enum Kind(val name: String):
     extends Kind("trait") with Classlike
   case Enum(override val typeParams: Seq[TypeParameter], override val argsLists: Seq[TermParameterList]) extends Kind("enum") with Classlike
   case EnumCase(kind: Object.type | Kind.Type | Val.type | Class) extends Kind("case")
-  case Def(typeParams: Seq[TypeParameter], argsLists: Seq[TermParameterList])
+  case Def(paramLists: Seq[Either[TermParameterList,TypeParameterList]])
     extends Kind("def")
   case Extension(on: ExtensionTarget, m: Kind.Def) extends Kind("def")
   case Constructor(base: Kind.Def) extends Kind("def")

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

@@ -344,14 +344,14 @@ trait ClassLikeSupport:
     val memberInfo = unwrapMemberInfo(c, methodSymbol)
 
     val basicKind: Kind.Def = Kind.Def(
-      genericTypes.map(mkTypeArgument(_, memberInfo.genericTypes, memberInfo.contextBounds)),
+      Right(genericTypes.map(mkTypeArgument(_, memberInfo.genericTypes, memberInfo.contextBounds))) +:
       paramLists.zipWithIndex.flatMap { (pList, index) =>
         memberInfo.paramLists(index) match
-          case EvidenceOnlyParameterList => Nil
+          case EvidenceOnlyParameterList => None
           case info: RegularParameterList =>
-            Seq(TermParameterList(pList.params.map(
+            Some(Left(TermParameterList(pList.params.map(
               mkParameter(_, paramPrefix, memberInfo = info)), paramListModifier(pList.params)
-            ))
+            )))
       }
     )
 

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

@@ -29,7 +29,7 @@ class ImplicitMembersExtensionTransformer(using DocContext) extends(Module => Mo
         case m @ Member(_, _, _, Kind.Extension(ExtensionTarget(_, _, _, _, MyDri, _), _), Origin.RegularlyDefined) =>
           val kind = m.kind match
             case Kind.Extension(_, d) => d
-            case _ => Kind.Def(Nil, Nil)
+            case _ => Kind.Def(Nil)
 
           Seq(m.withOrigin(Origin.ExtensionFrom(source.name, source.dri)).withKind(kind))
         case m @ Member(_, _, _, conversionProvider: ImplicitConversionProvider, Origin.RegularlyDefined) =>

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

@@ -106,8 +106,7 @@ class ScalaSignatureProvider:
       builder.kind(showKind),
       builder.name(method.name, method.dri),
       builder
-        .typeParamList(kind.typeParams)
-        .functionTermParameters(kind.argsLists)
+        .functionParameters(kind.paramLists)
         .pipe { builder =>
           instance.fold(builder)(i => builder.plain(": ").signature(i))
         }