Uniformize api's Parameter case classes

Author: Sporarum

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

@@ -44,24 +44,24 @@ enum Modifier(val name: String, val prefix: Boolean):
   case Transparent extends Modifier("transparent", true)
   case Infix extends Modifier("infix", true)
 
-case class ExtensionTarget(name: String, typeParams: Seq[TypeParameter], argsLists: Seq[ParametersList], signature: Signature, dri: DRI, position: Long)
+case class ExtensionTarget(name: String, typeParams: Seq[TypeParameter], argsLists: Seq[TermParameterList], signature: Signature, dri: DRI, position: Long)
 case class ImplicitConversion(from: DRI, to: DRI)
 trait ImplicitConversionProvider { def conversion: Option[ImplicitConversion] }
 trait Classlike:
   def typeParams: Seq[TypeParameter] = Seq.empty
-  def argsLists: Seq[ParametersList] = Seq.empty
+  def argsLists: Seq[TermParameterList] = Seq.empty
 
 enum Kind(val name: String):
   case RootPackage extends Kind("")
   case Package extends Kind("package")
-  case Class(override val typeParams: Seq[TypeParameter], override val argsLists: Seq[ParametersList])
+  case Class(override val typeParams: Seq[TypeParameter], override val argsLists: Seq[TermParameterList])
     extends Kind("class") with Classlike
   case Object extends Kind("object") with Classlike
-  case Trait(override val typeParams: Seq[TypeParameter], override val argsLists: Seq[ParametersList])
+  case Trait(override val typeParams: Seq[TypeParameter], override val argsLists: Seq[TermParameterList])
     extends Kind("trait") with Classlike
-  case Enum(override val typeParams: Seq[TypeParameter], override val argsLists: Seq[ParametersList]) extends Kind("enum") 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[ParametersList])
+  case Def(typeParams: Seq[TypeParameter], argsLists: Seq[TermParameterList])
     extends Kind("def")
   case Extension(on: ExtensionTarget, m: Kind.Def) extends Kind("def")
   case Constructor(base: Kind.Def) extends Kind("def")
@@ -97,12 +97,12 @@ object Annotation:
   case class LinkParameter(name: Option[String] = None, dri: DRI, value: String) extends AnnotationParameter
   case class UnresolvedParameter(name: Option[String] = None, unresolvedText: String) extends AnnotationParameter
 
-case class ParametersList(
-  parameters: Seq[Parameter],
+case class TermParameterList(
+  parameters: Seq[TermParameter],
   modifiers: String
 )
 
-case class Parameter(
+case class TermParameter(
   annotations: Seq[Annotation],
   modifiers: String,
   name: Option[String],
@@ -112,6 +112,8 @@ case class Parameter(
   isGrouped: Boolean = false
 )
 
+type TypeParameterList = Seq[TypeParameter]
+
 case class TypeParameter(
   annotations: Seq[Annotation],
   variance: "" | "+" | "-",

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

@@ -45,7 +45,7 @@ trait ClassLikeSupport:
           .filter(s => s.exists && !s.isHiddenByVisibility)
           .map( _.tree.asInstanceOf[DefDef])
       constr.fold(Nil)(
-        _.termParamss.map(pList => ParametersList(pList.params.map(p => mkParameter(p, parameterModifier)), paramListModifier(pList.params)))
+        _.termParamss.map(pList => TermParameterList(pList.params.map(p => mkParameter(p, parameterModifier)), paramListModifier(pList.params)))
         )
 
     if classDef.symbol.flags.is(Flags.Module) then Kind.Object
@@ -145,7 +145,7 @@ trait ClassLikeSupport:
             memberInfo.paramLists(index) match
               case EvidenceOnlyParameterList => Nil
               case info: RegularParameterList =>
-                Seq(ParametersList(paramList.params.map(mkParameter(_, memberInfo = info)), paramListModifier(paramList.params)))
+                Seq(TermParameterList(paramList.params.map(mkParameter(_, memberInfo = info)), paramListModifier(paramList.params)))
           }
           val target = ExtensionTarget(
             extSym.symbol.normalizedName,
@@ -349,7 +349,7 @@ trait ClassLikeSupport:
         memberInfo.paramLists(index) match
           case EvidenceOnlyParameterList => Nil
           case info: RegularParameterList =>
-            Seq(ParametersList(pList.params.map(
+            Seq(TermParameterList(pList.params.map(
               mkParameter(_, paramPrefix, memberInfo = info)), paramListModifier(pList.params)
             ))
       }
@@ -393,7 +393,7 @@ trait ClassLikeSupport:
       val inlinePrefix = if argument.symbol.flags.is(Flags.Inline) then "inline " else ""
       val nameIfNotSynthetic = Option.when(!argument.symbol.flags.is(Flags.Synthetic))(argument.symbol.normalizedName)
       val name = argument.symbol.normalizedName
-      Parameter(
+      TermParameter(
         argument.symbol.getAnnotations(),
         inlinePrefix + prefix(argument.symbol),
         nameIfNotSynthetic,

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

@@ -26,7 +26,7 @@ case class SignatureBuilder(content: Signature = Nil) extends ScalaSignatureUtil
   def annotationsBlock(d: Member): SignatureBuilder =
     d.annotations.foldLeft(this){ (bdr, annotation) => bdr.buildAnnotation(annotation)}
 
-  def annotationsInline(d: Parameter): SignatureBuilder =
+  def annotationsInline(d: TermParameter): SignatureBuilder =
     d.annotations.foldLeft(this){ (bdr, annotation) => bdr.buildAnnotation(annotation) }
 
   def annotationsInline(t: TypeParameter): SignatureBuilder =
@@ -78,7 +78,7 @@ case class SignatureBuilder(content: Signature = Nil) extends ScalaSignatureUtil
     bdr.annotationsInline(e).keyword(e.variance).tpe(e.name, Some(e.dri)).signature(e.signature)
   }
 
-  def functionParameters(params: Seq[ParametersList]) =
+  def functionParameters(params: Seq[TermParameterList]) =
     if params.isEmpty then this.plain("")
     else if params.size == 1 && params(0).parameters == Nil then this.plain("()")
     else this.list(params, separator = List(Plain(""))) { (bld, pList) =>