Fix dottydoc tests

Author: TheElectronWill

doc-tool/src/dotty/tools/dottydoc/DocCompiler.scala

@@ -8,6 +8,7 @@ import dotc.core.Phases.Phase
 import dotc.core.Mode
 import dotc.{Compiler, CompilationUnit, Run}
 import dotc.typer.FrontEnd
+import dotc.typer.ImportInfo.withRootImports
 
 import dotty.tools.dotc.fromtasty.{ReadTasty, TASTYRun}
 import dotty.tools.dotc.transform.CookComments
@@ -27,12 +28,14 @@ import dotty.tools.dotc.transform.CookComments
 class DocCompiler extends Compiler {
 
   override def newRun(using Context): Run = {
-    if (ctx.settings.fromTasty.value) {
-      reset()
+    reset()
+    if ctx.settings.fromTasty.value then
       new TASTYRun(this, ctx.addMode(Mode.ReadPositions).addMode(Mode.ReadComments))
-    }
     else
-      super.newRun
+      new Run(this, ctx) {
+        override protected def rootContext(using Context): Context =
+          super.rootContext.withRootImports
+      }
   }
 
   /** `DocFrontEnd` uses the Dotty `FrontEnd` without discarding the AnyVal

doc-tool/test/dotty/tools/dottydoc/DottyDocTest.scala

@@ -3,20 +3,19 @@ package dottydoc
 
 import vulpix.TestConfiguration
 
-import dotc.Compiler
+import dotc.{Compiler, Run}
 import dotc.core.Contexts.{ Context, ContextBase, FreshContext }
 import dotc.core.Comments.{ ContextDoc, ContextDocstrings }
 import dotc.util.SourceFile
 import dotc.core.Phases.Phase
-import dotty.tools.io.AbstractFile
 import dotc.typer.FrontEnd
-import dottydoc.core.{ DocASTPhase, ContextDottydoc }
-import model.Package
-import dotty.tools.dottydoc.util.syntax._
-import dotty.tools.io.AbstractFile
-import dotc.reporting.{ StoreReporter, MessageRendering }
+import dotc.typer.ImportInfo.withRootImports
 import dotc.interfaces.Diagnostic.ERROR
-import io.Directory
+import dotc.reporting.{ StoreReporter, MessageRendering }
+import util.syntax._
+import io.{AbstractFile, Directory}
+import core.{ DocASTPhase, ContextDottydoc }
+import model.Package
 import org.junit.Assert.fail
 
 import java.io.{ BufferedWriter, OutputStreamWriter }
@@ -114,7 +113,15 @@ trait DottyDocTest extends MessageRendering {
         val ctx = freshCtx(out.toString :: Nil)
         ctx.setSetting(ctx.settings.outputDir, AbstractFile.getDirectory(out))
       }
-      val dotc = new Compiler
+      val dotc = new Compiler {
+        override def newRun(using c: Context): Run =
+          reset()
+          new Run(this, c) {
+            override protected def rootContext(using Context): Context =
+              super.rootContext.withRootImports
+          }
+      }
+
       val run = dotc.newRun(using dotcCtx)
       run.compileSources(sources)
       assert(!dotcCtx.reporter.hasErrors)