Merge pull request #1127 from tgodzik/fix-3.10

bugfix: Make mdoc work with Scala 3.10.x

Author: tgodzik

build.sbt

@@ -7,6 +7,9 @@ addCommandAlias(
   "interfaces/test;runtime/test;parser/test;cli/test;mdoc/test;testsInput/test;tests/test;jsdocs/test;worksheets/test;unit/test;unitJS/test;jsApi/test;jsWorker/test;js/test;"
 )
 
+Global / resolvers += "scala-nightlies" at
+  "https://repo.scala-lang.org/artifactory/maven-nightlies"
+
 def scala212 = "2.12.21"
 def scala213 = "2.13.18"
 def scala3 = "3.3.8"

mdoc-js/src/main/scala-3/mdoc/modifiers/CompilerCompat.scala

@@ -1,6 +1,6 @@
 package mdoc.modifiers
 
-import dotty.tools.io.{AbstractFile, VirtualDirectory}
+import dotty.tools.io.{AbstractFile, VirtualDirectory, VirtualDirectoryCompat}
 
 import mdoc.internal.markdown.MarkdownCompiler
 import scala.meta.inputs.Input
@@ -9,5 +9,5 @@ import mdoc.internal.pos.TokenEditDistance
 import mdoc.internal.markdown.FileImport
 
 private[modifiers] object CompilerCompat {
-  def abstractFile(tg: String) = new VirtualDirectory(tg, None)
+  def abstractFile(tg: String) = VirtualDirectoryCompat.virtualDirectory(tg)
 }

mdoc-js/src/main/scala/mdoc/modifiers/JsModifier.scala

@@ -157,7 +157,7 @@ class JsModifier extends mdoc.PreModifier {
 
     val hasErrors = ctx.reporter.errorCount > oldErrors
 
-    val sjsirFiles = target.toList
+    val sjsirFiles = target.iterator
       .filter(_.name.endsWith(".sjsir"))
       .map(file => scalajsApi.get.inMemory(file.path, file.toByteArray))
 

mdoc/src/main/scala-3/dotty/tools/io/VirtualDirectoryCompat.scala

@@ -0,0 +1,7 @@
+package dotty.tools.io
+
+import dotty.tools.io.VirtualDirectory
+
+object VirtualDirectoryCompat {
+  def virtualDirectory(name: String): VirtualDirectory = new VirtualDirectory(name)
+}

mdoc/src/main/scala-3/mdoc/internal/markdown/AbstractClassFileLoader.scala

@@ -19,16 +19,39 @@ import java.util.Collections
 
 class AbstractFileClassLoader(val root: AbstractFile, parent: ClassLoader)
     extends ClassLoader(parent):
-  private def findAbstractFile(name: String) =
-    root.lookupPath(name.split('/').toIndexedSeq, directory = false)
+
+  /** Splits the given path using the given separator char, and finds the corresponding file through
+    * subdirectories. Optionally adds the given suffix to the last component. This is intended to
+    * make it easy to find files in formats such as "java/lang/Object" or "java.lang.Object".
+    */
+  final def lookupPath(
+      path: String,
+      separator: Char,
+      lastSuffix: String = "",
+      directory: Boolean = false
+  ): Option[AbstractFile] =
+    var file: AbstractFile = root
+    var idx = 0
+    var nextStepIdx = -1
+    while
+      nextStepIdx = path.indexOf(separator, idx)
+      nextStepIdx != -1
+    do
+      file.lookupName(path.substring(idx, nextStepIdx), directory = true) match
+        case null => return None
+        case f =>
+          file = f
+          idx = nextStepIdx + 1
+    Option(file.lookupName(path.substring(idx) + lastSuffix, directory = directory))
+  end lookupPath
 
   // on JDK 20 the URL constructor we're using is deprecated,
   // but the recommended replacement, URL.of, doesn't exist on JDK 8
   @annotation.nowarn("cat=deprecation")
   override protected def findResource(name: String): URL | Null =
-    findAbstractFile(name) match
-      case null => null
-      case file => new URL(
+    lookupPath(name, '/') match
+      case None => null
+      case Some(file) => new URL(
           null,
           s"memory:${file.path}",
           new URLStreamHandler {

mdoc/src/main/scala-3/mdoc/internal/markdown/Instrumenter.scala

@@ -198,7 +198,7 @@ object Instrumenter {
     def unapply(tree: Tree): Option[List[Name]] =
       tree match {
         case t: Defn.Val if t.mods.exists(_.isInstanceOf[Lazy]) => Some(Nil)
-        case t: Tree.WithPats with Defn => Some(t.pats.flatMap(binders))
+        case t: (Tree.WithPats & Defn) => Some(t.pats.flatMap(binders))
         case _: Defn => Some(Nil)
         case _: Import => Some(Nil)
         case _ => None

mdoc/src/main/scala-3/mdoc/internal/markdown/MarkdownCompiler.scala

@@ -39,7 +39,7 @@ import dotty.tools.dotc.interfaces.{Diagnostic => IDiagnostic}
 import dotty.tools.dotc.reporting._
 import dotty.tools.dotc.parsing.Parsers.Parser
 import dotty.tools.dotc.Compiler
-import dotty.tools.io.{AbstractFile, VirtualDirectory}
+import dotty.tools.io.{AbstractFile, VirtualDirectory, VirtualDirectoryCompat}
 import dotty.tools.dotc.util.SourceFile
 
 import scala.annotation.implicitNotFound
@@ -64,7 +64,7 @@ class MarkdownDriver(val settings: List[String]) extends Driver {
 class MarkdownCompiler(
     classpath: String,
     val scalacOptions: List[String],
-    target: AbstractFile = new VirtualDirectory("(memory)")
+    target: AbstractFile = VirtualDirectoryCompat.virtualDirectory("(memory)")
 ) {
 
   private val defaultFlags =
@@ -119,11 +119,6 @@ class MarkdownCompiler(
     this.getClass.getClassLoader
   )
 
-  private def clearTarget(): Unit = target match {
-    case vdir: VirtualDirectory => vdir.clear()
-    case _ =>
-  }
-
   private def toSource(input: Input): SourceFile = {
     SourceFile.virtual(input.filename, new String(input.chars))
   }
@@ -142,7 +137,6 @@ class MarkdownCompiler(
       fileImports: List[FileImport]
   ): Unit = {
     reset()
-    clearTarget()
     val compiler = new Compiler
     val run = compiler.newRun(using context)
     val inputs = List(input)