Uniformize ScalaSignatureUtils param methods

Author: Sporarum

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

@@ -313,10 +313,10 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
         case (Some(on), members) =>
           val typeSig = SignatureBuilder()
             .keyword("extension ")
-            .generics(on.typeParams)
+            .typeParamList(on.typeParams)
             .content
           val argsSig = SignatureBuilder()
-            .functionParameters(on.argsLists)
+            .functionTermParameters(on.argsLists)
             .content
           val sig = typeSig ++ Signature(Plain(s"(${on.name}: ")) ++ on.signature ++ Signature(Plain(")")) ++ argsSig
           MGroup(span(cls := "groupHeader")(sig.map(renderElement(_))), members.sortBy(_.name).toSeq, on.name) -> on.position

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

@@ -169,10 +169,10 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
         case Kind.Extension(on, _) =>
           val typeSig = SignatureBuilder()
             .keyword("extension ")
-            .generics(on.typeParams)
+            .typeParamList(on.typeParams)
             .content
           val argsSig = SignatureBuilder()
-            .functionParameters(on.argsLists)
+            .functionTermParameters(on.argsLists)
             .content
           flattenToText(typeSig ++ argsSig)
         case _ => ""

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

@@ -58,8 +58,8 @@ class ScalaSignatureProvider:
       builder.kind(showKind),
       builder.name(member.name, member.dri),
       builder
-        .generics(kind.typeParams)
-        .functionParameters(kind.argsLists)
+        .typeParamList(kind.typeParams)
+        .functionTermParameters(kind.argsLists)
         .parentsSignature(member)
     )
 
@@ -106,8 +106,8 @@ class ScalaSignatureProvider:
       builder.kind(showKind),
       builder.name(method.name, method.dri),
       builder
-        .generics(kind.typeParams)
-        .functionParameters(kind.argsLists)
+        .typeParamList(kind.typeParams)
+        .functionTermParameters(kind.argsLists)
         .pipe { builder =>
           instance.fold(builder)(i => builder.plain(": ").signature(i))
         }
@@ -151,7 +151,7 @@ class ScalaSignatureProvider:
       builder.modifiersAndVisibility(typeDef),
       builder.kind(tpe),
       builder.name(typeDef.name, typeDef.dri),
-      builder.generics(tpe.typeParams).pipe { bdr =>
+      builder.typeParamList(tpe.typeParams).pipe { bdr =>
         if (!tpe.opaque) {
           (if tpe.concreate then bdr.plain(" = ") else bdr)
             .signature(typeDef.signature)

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

@@ -74,21 +74,27 @@ case class SignatureBuilder(content: Signature = Nil) extends ScalaSignatureUtil
   def kind(k: Kind) =
     keyword(k.name + " ")
 
-  def generics(on: Seq[TypeParameter]) = list(on.toList, List(Plain("[")), List(Plain("]"))){ (bdr, e) =>
+
+  def functionParameters(paramss: Seq[ Either[TermParameterList,TypeParameterList] ]) =
+    this.list(paramss, separator = List(Plain(""))) {
+      case (bld, Left(params: TermParameterList))  => bld.termParamList(params)
+      case (bld, Right(params: TypeParameterList)) => bld.typeParamList(params)
+    }
+
+  def termParamList(params: TermParameterList) =
+    this.list(params.parameters, prefix = List(Plain("("), Keyword(params.modifiers)), suffix = List(Plain(")")), forcePrefixAndSuffix = true) { (bld, p) =>
+      val annotationsAndModifiers = bld.annotationsInline(p)
+        .keyword(p.modifiers)
+      val name = p.name.fold(annotationsAndModifiers)(annotationsAndModifiers.name(_, p.dri).plain(": "))
+      name.signature(p.signature)
+    }
+
+  def typeParamList(on: TypeParameterList) = list(on.toList, List(Plain("[")), List(Plain("]"))){ (bdr, e) =>
     bdr.annotationsInline(e).keyword(e.variance).tpe(e.name, Some(e.dri)).signature(e.signature)
   }
 
-  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) =>
-      bld.list(pList.parameters, prefix = List(Plain("("), Keyword(pList.modifiers)), suffix = List(Plain(")")), forcePrefixAndSuffix = true) { (bld, p) =>
-        val annotationsAndModifiers = bld.annotationsInline(p)
-          .keyword(p.modifiers)
-        val name = p.name.fold(annotationsAndModifiers)(annotationsAndModifiers.name(_, p.dri).plain(": "))
-        name.signature(p.signature)
-      }
-    }
+  def functionTermParameters(paramss: Seq[TermParameterList]) =
+    this.list(paramss, separator = List(Plain(""))) { (bld, pList) => bld.termParamList(pList) }
 
 trait ScalaSignatureUtils:
   extension (tokens: Seq[String]) def toSignatureString(): String =