Introduce DocContext and use it in TastyInspector

Author: romanowski

scala3doc/src/dotty/dokka/DocContext.scala

@@ -0,0 +1,5 @@
+package dotty.dokka
+
+import dotty.tools.dotc.core.Contexts._
+
+type DocContext = Context

scala3doc/src/dotty/dokka/DottyDokkaConfig.scala

@@ -6,7 +6,7 @@ import java.io.File
 import collection.JavaConverters._
 import dotty.dokka.site.StaticSiteContext
 
-case class DottyDokkaConfig(args: Scala3doc.Args) extends DokkaConfiguration:
+case class DottyDokkaConfig(args: Scala3doc.Args, docContext: DocContext) extends DokkaConfiguration:
   override def getOutputDir: File = args.output
   override def getCacheRoot: File = null
   override def getOfflineMode: Boolean = false

scala3doc/src/dotty/dokka/DottyDokkaPlugin.scala

@@ -49,7 +49,7 @@ class DottyDokkaPlugin extends DokkaJavaPlugin:
   // Just turn off another translator since multiple overrides does not work
   val disableDescriptorTranslator = extend(
     _.extensionPoint(CoreExtensions.INSTANCE.getSourceToDocumentableTranslator)
-    .fromInstance(ScalaModuleProvider)
+    .fromRecipe(ctx => new ScalaModuleProvider(using ctx.docContext))
     .overrideExtension(dokkaBase.getDescriptorToDocumentableTranslator)
     .name("disableDescriptorTranslator")
   )
@@ -173,6 +173,7 @@ class DottyDokkaPlugin extends DokkaJavaPlugin:
 extension (ctx: DokkaContext):
   def siteContext: Option[StaticSiteContext] = ctx.getConfiguration.asInstanceOf[DottyDokkaConfig].staticSiteContext
   def args: Scala3doc.Args = ctx.getConfiguration.asInstanceOf[DottyDokkaConfig].args
+  def docContext = ctx.getConfiguration.asInstanceOf[DottyDokkaConfig].docContext
 
 // TODO (https://github.com/lampepfl/scala3doc/issues/232): remove once problem is fixed in Dokka
 extension [T]  (builder: ExtensionBuilder[T]):

scala3doc/src/dotty/dokka/Scala3doc.scala

@@ -9,16 +9,14 @@ import java.util.jar._
 import collection.JavaConverters._
 import collection.immutable.ArraySeq
 
-import scala.tasty.inspector.TastyInspector
 import java.nio.file.Files
 
 import dotty.tools.dotc.config.Settings._
 import dotty.tools.dotc.config.CommonScalaSettings
 import dotty.tools.dotc.report
-import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.reporting.Reporter
 
-class Scala3DocDokkaLogger(using Context) extends DokkaLogger:
+class Scala3DocDokkaLogger(using DocContext) extends DokkaLogger:
   def debug(msg: String): Unit = report.debuglog(msg)
 
   // We do not want errors from dokka (that are) not critical to fail our runs
@@ -66,7 +64,7 @@ object Scala3doc:
     revision: Option[String] = None
   )
 
-  def run(args: Array[String])(using Context): Reporter =
+  def run(args: Array[String])(using DocContext): Reporter =
     val parsedArgs = Scala3docArgs.extract(args.toList)
 
     def listTastyFiles(f: File): Seq[File] =
@@ -76,7 +74,7 @@ object Scala3doc:
       )
     val tastyFiles = parsedArgs.tastyFiles ++ parsedArgs.tastyDirs.flatMap(listTastyFiles)
 
-    val reporter = summon[Context].reporter
+    val reporter = summon[DocContext].reporter
     if !reporter.hasErrors then
       val updatedArgs = parsedArgs.copy(tastyDirs = Nil, tastyFiles = tastyFiles)
 
@@ -87,7 +85,7 @@ object Scala3doc:
     else report.error("Failure")
     reporter
 
-  private [dokka] def run(args: Args, logger: DokkaLogger = DokkaConsoleLogger.INSTANCE) =
-    new DokkaGenerator(new DottyDokkaConfig(args), logger).generate()
+  private [dokka] def run(args: Args, logger: DokkaLogger = DokkaConsoleLogger.INSTANCE)(using DocContext) =
+    new DokkaGenerator(new DottyDokkaConfig(args, summon[DocContext]), logger).generate()
 
 

scala3doc/src/dotty/dokka/ScalaModuleCreator.scala

@@ -13,19 +13,14 @@ import org.jetbrains.dokka.model._
 import org.jetbrains.dokka.base.parsers.MarkdownParser
 import collection.JavaConverters._
 import kotlin.coroutines.Continuation
+import dotty.tools.dotc.core.Contexts._
 
-object ScalaModuleProvider extends SourceToDocumentableTranslator:
+class ScalaModuleProvider(using DocContext) extends SourceToDocumentableTranslator:
    override def invoke(sourceSet: DokkaSourceSet, cxt: DokkaContext, unused: Continuation[? >: DModule]) =
     cxt.getConfiguration match
       case dottyConfig: DottyDokkaConfig =>
         val parser = new MarkdownParser(_ => null)
-        val inspector = DokkaTastyInspector(sourceSet, parser, dottyConfig)
-        val filePaths = dottyConfig.args.tastyFiles.map(_.getAbsolutePath)
-        val (tastyFiles, jars) = filePaths.toList.partition(_.endsWith(".tasty"))
-        val classpath = dottyConfig.args.classpath.split(java.io.File.pathSeparator).toList
-
-        inspector.inspectAllTastyFiles(tastyFiles, jars, classpath)
-        val result = inspector.result()
+        val result = DokkaTastyInspector(sourceSet, parser, dottyConfig).result()
 
         def flattenMember(m: Member): Seq[(DRI, Member)] = (m.dri -> m) +: m.allMembers.flatMap(flattenMember)
 

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

@@ -43,6 +43,12 @@ case class DokkaTastyInspector(sourceSet: SourceSetWrapper, parser: Parser, conf
     topLevels ++= parser.parseRootTree(root.asInstanceOf[parser.qctx.reflect.Tree])
 
   def result(): List[DPackage] =
+    topLevels.clear()
+    val filePaths = config.args.tastyFiles.map(_.getAbsolutePath).toList
+    val classpath = config.args.classpath.split(java.io.File.pathSeparator).toList
+
+    inspectFilesInContext(classpath, filePaths)(using config.docContext)
+
     val all = topLevels.result()
     val packages = all
       .filter(_.isInstanceOf[DPackage])