Apply requested changes, fix SignatureTests parser, fix type alliance for vals, add some tests

Author: BarkingBad

scala3doc-testcases/src/tests/typeAppliance.scala

@@ -6,10 +6,11 @@ trait AClass[A, B]:
 
 trait BClass[A, B] extends AClass[A, B]:
   override def funASD[X, D](f: B => X): BClass[A, X]
-  val f: (=> B) => String = _ => "abc"
+  val f: (=> B) => String
+  = _ => "abc"
 
 
 abstract class CClass[U] extends BClass[Int, U]:
-  def xdxdkk(n: Int)(b: Int): Int = 1
-  def isByNameType: String = "xd"
-  def vararg1(a: A*): C
+  def someFun(n: Int)(b: Int): Int
+  = 1
+

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

@@ -389,7 +389,7 @@ trait ClassLikeSupport:
         inlinePrefix + prefix(argument.symbol),
         nameIfNotSynthetic,
         argument.symbol.dri,
-        memberInfo.flatMap(_.get(name).map(_.dokkaType.asSignature)).getOrElse(argument.tpt.dokkaType.asSignature),
+        memberInfo.flatMap(_.get(name)).fold(argument.tpt.dokkaType.asSignature)(_.dokkaType.asSignature),
         isExtendedSymbol,
         isGrouped
       )
@@ -405,7 +405,7 @@ trait ClassLikeSupport:
       variancePrefix,
       name,
       argument.symbol.dri,
-      memberInfo.flatMap(_.get(name).map(_.dokkaType.asSignature)).getOrElse(argument.rhs.dokkaType.asSignature)
+      memberInfo.flatMap(_.get(name)).fold(argument.rhs.dokkaType.asSignature)(_.dokkaType.asSignature)
     )
 
   def parseTypeDef(typeDef: TypeDef): Member =
@@ -479,9 +479,7 @@ trait ClassLikeSupport:
   case class MemberInfo(genericTypes: Map[String, TypeBounds], paramLists: List[Map[String, TypeRepr]], res: TypeRepr)
 
   def unwrapMemberInfo(c: ClassDef, symbol: Symbol): MemberInfo =
-    val baseTypeRepr = typeForClass(c).asInstanceOf[dotty.tools.dotc.core.Types.Type]
-      .memberInfo(symbol.asInstanceOf[dotty.tools.dotc.core.Symbols.Symbol])(using qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx)
-      .asInstanceOf[TypeRepr]
+    val baseTypeRepr = memberInfo(c, symbol)
 
     def handlePolyType(polyType: PolyType): MemberInfo =
       MemberInfo(polyType.paramNames.zip(polyType.paramBounds).toMap, List.empty, polyType.resType)

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

@@ -105,4 +105,12 @@ trait SyntheticsSupport:
     given dotc.core.Contexts.Context = qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
     val cSym = c.symbol.asInstanceOf[dotc.core.Symbols.Symbol]
     cSym.typeRef.appliedTo(cSym.typeParams.map(_.typeRef)).asInstanceOf[TypeRepr]
-    
+
+  def memberInfo(c: ClassDef, symbol: Symbol): TypeRepr =
+    import qctx.reflect._
+    import dotty.tools.dotc
+    given dotc.core.Contexts.Context = qctx.asInstanceOf[scala.quoted.runtime.impl.QuotesImpl].ctx
+    typeForClass(c).asInstanceOf[dotc.core.Types.Type]
+      .memberInfo(symbol.asInstanceOf[dotc.core.Symbols.Symbol])
+      .asInstanceOf[TypeRepr]
+

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

@@ -174,7 +174,10 @@ trait TypesSupport:
             case Seq(rtpe) =>
               text("() => ") :: inner(rtpe)
             case Seq(arg, rtpe) =>
-              inner(arg) ++ texts(" => ") ++ inner(rtpe)
+              val ar = arg match
+                case a: ByNameType => texts("(") ++ inner(a) ++ texts(")")
+                case o => inner(o)
+              ar ++ texts(" => ") ++ inner(rtpe)
             case args =>
               texts("(") ++ commas(args.init.map(inner)) ++ texts(") => ") ++ inner(args.last)
         else if t.isTupleType then

scala3doc/test/dotty/dokka/SignatureTest.scala

@@ -98,7 +98,7 @@ abstract class SignatureTest(
           case unexpectedRegex(signature) => findName(signature, kinds).map(Unexpected(_))
           case expectedRegex(signature) => findName(signature, kinds).map(Expected(_, signature))
           case signature =>
-            findName(signature, kinds).map(Expected(_, commentRegex.replaceAllIn(signature, "").compactWhitespaces))
+            findName(signature, kinds).map(Expected(_, commentRegex.replaceAllIn(signature, "").compactWhitespaces.reverse.dropWhile(List('{', ':').contains(_)).reverse))
         }
 
   private def signaturesFromDocumentation(root: PageNode)(using DocContext): Seq[String] =

scala3doc/test/dotty/dokka/SignatureTestCases.scala

@@ -31,6 +31,8 @@ class FieldsSignatures extends SignatureTest("fieldsSignatures", SignatureTest.a
 
 class NestedSignatures extends SignatureTest("nested", SignatureTest.all)
 
+class TypeAppliacneSignatures extends SignatureTest("typeAppliance", SignatureTest.all)
+
 class CompanionObjectSignatures extends SignatureTest("companionObjectSignatures", SignatureTest.all)
 
 class PackageSymbolSignatures extends SignatureTest("packageSymbolSignatures", SignatureTest.all)
@@ -84,4 +86,4 @@ class ImplicitConversionsTest3 extends SignatureTest(
   filterFunc = _.toString.endsWith("ClassWithConversionWithProperType.html")
 )
 
-class SpecializedSignature extends SignatureTest("specializedSignature", SignatureTest.all)
+class SpecializedSignature extends SignatureTest("specializedSignature", SignatureTest.all)