Trying Scaladoc + scala2-library-cc

[skip ci]

Author: bracevac

project/Build.scala

@@ -2584,7 +2584,7 @@ object ScaladocConfigs {
 
   def defaultSourceLinks(version: String = dottyNonBootstrappedVersion, refVersion: String = dottyVersion) = Def.task {
     def stdLibVersion = stdlibVersion(NonBootstrapped)
-    def srcManaged(v: String, s: String) = s"out/bootstrap/scala2-library-bootstrapped/scala-$v/src_managed/main/$s-library-src"
+    def srcManaged(v: String, s: String) = s"out/bootstrap/scala2-library-cc/scala-$v/src_managed/main/$s-library-src"
     SourceLinks(
       List(
         scalaSrcLink(stdLibVersion, srcManaged(version, "scala") + "="),
@@ -2673,7 +2673,7 @@ object ScaladocConfigs {
 
   lazy val Scala3 = Def.task {
     val dottyJars: Seq[java.io.File] = Seq(
-      (`scala2-library-bootstrapped`/Compile/products).value,
+      (`scala2-library-cc`/Compile/products).value,
       (`scala3-library-bootstrapped`/Compile/products).value,
       (`scala3-interfaces`/Compile/products).value,
       (`tasty-core-bootstrapped`/Compile/products).value,
@@ -2682,7 +2682,7 @@ object ScaladocConfigs {
     val roots = dottyJars.map(_.getAbsolutePath)
 
     val managedSources =
-      (`scala2-library-bootstrapped`/Compile/sourceManaged).value / "scala-library-src"
+      (`scala2-library-cc`/Compile/sourceManaged).value / "scala-library-src"
     val projectRoot = (ThisBuild/baseDirectory).value.toPath
     val stdLibRoot = projectRoot.relativize(managedSources.toPath.normalize())
     val docRootFile = stdLibRoot.resolve("rootdoc.txt")
@@ -2718,7 +2718,7 @@ object ScaladocConfigs {
   }
 
   def stableScala3(version: String) = Def.task {
-    val scalaLibrarySrc = s"out/bootstrap/scala2-library-bootstrapped/scala-$version-bin-SNAPSHOT-nonbootstrapped/src_managed"
+    val scalaLibrarySrc = s"out/bootstrap/scala2-library-cc/scala-$version-bin-SNAPSHOT-nonbootstrapped/src_managed"
     val dottyLibrarySrc = "library/src"
     Scala3.value
       .add(defaultSourceLinks(version + "-bin-SNAPSHOT-nonbootstrapped", version).value)
@@ -2739,7 +2739,7 @@ object ScaladocConfigs {
       .add(DocRootContent(s"$scalaLibrarySrc/rootdoc.txt"))
       .withTargets(
         Seq(
-          s"out/bootstrap/scala2-library-bootstrapped/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes",
+          s"out/bootstrap/scala2-library-cc/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes",
           s"out/bootstrap/scala3-library-bootstrapped/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes",
           s"tmp/interfaces/target/classes",
           s"out/bootstrap/tasty-core-bootstrapped/scala-$version-bin-SNAPSHOT-nonbootstrapped/classes"

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

@@ -112,7 +112,34 @@ trait TypesSupport:
         inner(tpe) :+ plain("*")
       case AppliedType(repeatedClass, Seq(tpe)) if isRepeated(repeatedClass) =>
         inner(tpe) :+ plain("*")
-      case AnnotatedType(tpe, _) =>
+      case tp @ AnnotatedType(tpe, annotTerm) =>
+        val retainsSym = Symbol.requiredClass("_root_.scala.annotation.retains")
+        val retainsCapSym = Symbol.requiredClass("_root_.scala.annotation.retainsCap")
+        val retainsByNameSym = Symbol.requiredClass("_root_.scala.annotation.retainsByName")
+        val retainsSym2 = Symbol.requiredClass("scala.annotation.retains")
+        val retainsCapSym2 = Symbol.requiredClass("scala.annotation.retainsCap")
+        val retainsByNameSym2 = Symbol.requiredClass("scala.annotation.retainsByName")
+        val sym = annotTerm.tpe match
+          case AppliedType(base, _) => base.typeSymbol
+          case other                => other.typeSymbol
+        if sym.name.contains("retains") then
+          println("Annot: " + sym)
+          println("name: " + sym.fullName)
+          println("id: " + System.identityHashCode(sym))
+          println("isClassDef: " + sym.isClassDef)
+          println("isRetains: " + sym == retainsSym)
+          println("isRetainsCap: " + sym == retainsCapSym)
+          println("isRetainsByName: " + sym == retainsByNameSym)
+          println("isRetains2: " + sym == retainsSym2)
+          println("isRetainsCap2: " + sym == retainsCapSym2)
+          println("isRetainsByName2: " + sym == retainsByNameSym2)
+          println("retainsSym " + retainsSym)
+          println("retainsSym2 " + retainsSym2)
+          println("retainsSym.isClassDef " + retainsSym.isClassDef)
+          println("retainsSym2.isClassDef " + retainsSym2.isClassDef)
+          println("retainsSym.id " + System.identityHashCode(retainsSym))
+          println("retainsSym2.id " + System.identityHashCode(retainsSym2))
+          println()
         inner(tpe)
       case tl @ TypeLambda(params, paramBounds, AppliedType(tpe, args))
         if paramBounds.map(inner).forall(_.isEmpty) && params.zip(args.map(inner).flatten.map(_.name)).forall(_ == _) =>