Revert "Fix scaladoc TastyInspector regressions (#21716)"

This reverts commit 21a7cbd.

Author: hamzaremmal

sbt-test/sbt-dotty/scaladoc-regressions/build.sbt

@@ -5,7 +5,7 @@ package tasty
 import java.util.regex.Pattern
 
 import scala.util.{Try, Success, Failure}
-import scala.tasty.inspector.{ScaladocInternalTastyInspector, Inspector, Tasty}
+import scala.tasty.inspector.{TastyInspector, Inspector, Tasty}
 import scala.quoted._
 
 import dotty.tools.dotc
@@ -160,7 +160,7 @@ object ScaladocTastyInspector:
       report.error("File extension is not `tasty` or `jar`: " + invalidPath)
 
     if tastyPaths.nonEmpty then
-      ScaladocInternalTastyInspector.inspectAllTastyFilesInContext(tastyPaths, jarPaths, classpath)(inspector)(using ctx.compilerContext)
+      TastyInspector.inspectAllTastyFiles(tastyPaths, jarPaths, classpath)(inspector)
 
     val all = inspector.topLevels.result()
     all.groupBy(_._1).map { case (pckName, members) =>

sbt-test/sbt-dotty/scaladoc-regressions/i18231/src/main/scala/main.scala

@@ -1,7 +1,5 @@
-// Renamed copy of tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala
+// Copy of tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala
 // FIXME remove this copy of the file
-// Since copying, an inspectAllTastyFilesInContext method was added for scaladoc only
-// to fix regressions introduced by the switch from old to a new TastyInspector
 
 package scala.tasty.inspector
 
@@ -23,7 +21,7 @@ import dotty.tools.dotc.report
 
 import java.io.File.pathSeparator
 
-object ScaladocInternalTastyInspector:
+object TastyInspector:
 
   /** Load and process TASTy files using TASTy reflect
    *
@@ -43,32 +41,6 @@ object ScaladocInternalTastyInspector:
   def inspectTastyFilesInJar(jar: String)(inspector: Inspector): Boolean =
     inspectAllTastyFiles(Nil, List(jar), Nil)(inspector)
 
-  private def checkFiles(tastyFiles: List[String], jars: List[String]): Unit =
-    def checkFile(fileName: String, ext: String): Unit =
-      val file = dotty.tools.io.Path(fileName)
-      if !file.ext.toLowerCase.equalsIgnoreCase(ext) then
-        throw new IllegalArgumentException(s"File extension is not `.$ext`: $file")
-      else if !file.exists then
-        throw new IllegalArgumentException(s"File not found: ${file.toAbsolute}")
-    tastyFiles.foreach(checkFile(_, "tasty"))
-    jars.foreach(checkFile(_, "jar"))
-
-  /**
-  * Added for Scaladoc-only.
-  * Meant to fix regressions introduces by the switch from old to new TastyInspector:
-  *  https://github.com/scala/scala3/issues/18231
-  *  https://github.com/scala/scala3/issues/20476
-  * Stable TastyInspector API does not support passing compiler context.
-  */
-  def inspectAllTastyFilesInContext(tastyFiles: List[String], jars: List[String], dependenciesClasspath: List[String])(inspector: Inspector)(using Context): Boolean =
-    checkFiles(tastyFiles, jars)
-    val classes = tastyFiles ::: jars
-    classes match
-      case Nil => true
-      case _ =>
-        val reporter = inspectorDriver(inspector).process(inspectorArgs(dependenciesClasspath, classes), summon[Context])
-        !reporter.hasErrors
-
   /** Load and process TASTy files using TASTy reflect
    *
    *  @param tastyFiles List of paths of `.tasty` files
@@ -78,7 +50,14 @@ object ScaladocInternalTastyInspector:
    *  @return boolean value indicating whether the process succeeded
    */
   def inspectAllTastyFiles(tastyFiles: List[String], jars: List[String], dependenciesClasspath: List[String])(inspector: Inspector): Boolean =
-    checkFiles(tastyFiles, jars)
+    def checkFile(fileName: String, ext: String): Unit =
+      val file = dotty.tools.io.Path(fileName)
+      if !file.ext.toLowerCase.equalsIgnoreCase(ext) then
+        throw new IllegalArgumentException(s"File extension is not `.$ext`: $file")
+      else if !file.exists then
+        throw new IllegalArgumentException(s"File not found: ${file.toAbsolute}")
+    tastyFiles.foreach(checkFile(_, "tasty"))
+    jars.foreach(checkFile(_, "jar"))
     val files = tastyFiles ::: jars
     inspectFiles(dependenciesClasspath, files)(inspector)
 
@@ -145,4 +124,4 @@ object ScaladocInternalTastyInspector:
   end inspectFiles
 
 
-end ScaladocInternalTastyInspector
+end TastyInspector

sbt-test/sbt-dotty/scaladoc-regressions/i20476/src/main/scala/main.scala

@@ -14,7 +14,6 @@ class LinkWarningsTest extends ScaladocTest("noLinkWarnings"):
 
   override def runTest = afterRendering {
     val diagnostics = summon[DocContext].compilerContext.reportedDiagnostics
-    val filteredWarnings = diagnostics.warningMsgs.filter(_ != "1 warning found")
-    assertEquals("There should be exactly one warning", 1, filteredWarnings.size)
+    assertEquals("There should be exactly one warning", 1, diagnostics.warningMsgs.size)
     assertNoErrors(diagnostics)
   }