Migrate scaladoc-new

Author: noti0na1

library/src/scala/IArray.scala

@@ -330,6 +330,12 @@ object IArray:
   extension [T, U >: T: ClassTag](x: T)
     def +:(arr: IArray[U]): IArray[U] = genericArrayOps(arr).prepended(x)
 
+  // For backward compatibility with code compiled without -Yexplicit-nulls.
+  // If `a` is null, return null; otherwise, return `f`.
+  // Have to add a private mapNull here to avoid errors
+  private inline def mapNull[A, B](a: A, inline f: B): B =
+    if((a: A | Null) == null) null.asInstanceOf[B] else f
+
   /** Conversion from IArray to immutable.ArraySeq.
    *
    *  Note: Both the parameter and the return type are non-nullable. However, if a null

project/Build.scala

@@ -2691,7 +2691,7 @@ object Build {
       Compile / scalacOptions := Seq("-deprecation", "-feature", "-unchecked", "-encoding", "UTF8", "-language:implicitConversions"),
       Compile / scalacOptions += "-experimental",
       // TODO: Enable these flags when the new stdlib is explicitelly null checked
-      //Compile / scalacOptions ++= Seq("-Yexplicit-nulls", "-Wsafe-init"),
+      Compile / scalacOptions ++= Seq("-Yexplicit-nulls", "-Wsafe-init"),
       // Make sure that the produced artifacts have the minimum JVM version in the bytecode
       Compile / javacOptions  ++= Seq("--release", Versions.minimumJVMVersion),
       Compile / scalacOptions ++= Seq("--java-output-version", Versions.minimumJVMVersion),

scaladoc/src/dotty/tools/scaladoc/PathBased.scala

@@ -24,7 +24,7 @@ object PathBased:
 
   def parse[T](args: Seq[String], projectRoot: Path = Paths.get("").toAbsolutePath())(using parser: ArgParser[T]): ParsingResult[T] = {
     val parsed = args.map {
-      case PathExtractor(path, arg) => parser.parse(arg).map(elem => Entry(Some(Paths.get(path)), elem))
+      case PathExtractor(path: String, arg: String) => parser.parse(arg).map(elem => Entry(Some(Paths.get(path)), elem))
       case arg => parser.parse(arg).map(elem => Entry(None, elem))
     }
     val errors = parsed.collect {

scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala

@@ -19,7 +19,7 @@ object Scaladoc:
     tastyFiles: Seq[File] = Nil,
     classpath: String = "",
     bootclasspath: String = "",
-    output: File,
+    output: File | Null,
     docsRoot: Option[String] = None,
     projectVersion: Option[String] = None,
     projectLogo: Option[String] = None,
@@ -66,13 +66,13 @@ object Scaladoc:
       if !ctx.reporter.hasErrors then
         val updatedArgs = parsedArgs.copy(tastyDirs = parsedArgs.tastyDirs, tastyFiles = tastyFiles)
 
-        if (parsedArgs.output.exists()) util.IO.delete(parsedArgs.output)
+        if (parsedArgs.output.nn.exists()) util.IO.delete(parsedArgs.output)
 
         run(updatedArgs)
         report.inform("Done")
       else report.error("Failure")
 
-      if parsedArgs.generateInkuire then dumpInkuireDB(parsedArgs.output.getAbsolutePath, parsedArgs)
+      if parsedArgs.generateInkuire then dumpInkuireDB(parsedArgs.output.nn.getAbsolutePath, parsedArgs)
     }
 
     ctx.reporter

scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala

@@ -73,9 +73,9 @@ class SourceLinkParser(revision: Option[String]) extends ArgParser[SourceLink]:
         if unsupported.nonEmpty then Left(s"Unsupported patterns from scaladoc format are used: ${unsupported.mkString(" ")}")
         else Right(TemplateSourceLink(supported.foldLeft(string)((template, pattern) =>
           template.replace(pattern, SupportedScalaDocPatternReplacements(pattern)))))
-      case KnownProvider(name, organization, repo, rawRevision, rawSubPath) =>
-        val subPath = Option(rawSubPath).fold("")("/" + _.drop(1))
-        val pathRev = Option(rawRevision).map(_.drop(1)).orElse(revision)
+      case KnownProvider(name: String, organization: String, repo: String, rawRevision, rawSubPath) =>
+        val subPath = Option.fromNullable(rawSubPath).fold("")("/" + _.drop(1))
+        val pathRev = Option.fromNullable(rawRevision).map(_.drop(1)).orElse(revision)
 
         def withRevision(template: String => SourceLink) =
           pathRev.fold(Left(s"No revision provided"))(r => Right(template(r)))

scaladoc/src/dotty/tools/scaladoc/compat.scala

@@ -17,10 +17,10 @@ type JMap[K, V] = java.util.Map[K, V]
 type JHashMap[K, V] = java.util.HashMap[K, V]
 type JMapEntry[K, V] = java.util.Map.Entry[K, V]
 
-private val emptyListInst = Collections.emptyList
+private val emptyListInst: JList[AnyRef] = Collections.emptyList
 def JNil[A] = emptyListInst.asInstanceOf[JList[A]]
 
-private val emptyMapInst = Collections.emptyMap
+private val emptyMapInst: JMap[AnyRef, AnyRef] = Collections.emptyMap
 def emptyJMap[A, B] = emptyMapInst.asInstanceOf[JMap[A, B]]
 
 enum DocLink:

scaladoc/src/dotty/tools/scaladoc/parsers/WikiCodeBlockParser.scala

@@ -55,10 +55,9 @@ object WikiCodeBlockParser {
     def tryStart(state: ParserState, matchedBlockParser: MatchedBlockParser): BlockStart = {
       val nextNonSpace = state.getNextNonSpaceIndex
       val line = state.getLine
-      var matcher: Matcher = null
       if state.getIndent < 4 then {
         val trySequence = line.subSequence(nextNonSpace, line.length)
-        matcher = OPENING_FENCE.matcher(trySequence)
+        val matcher = OPENING_FENCE.matcher(trySequence)
         if matcher.find then {
           val fenceLength = matcher.group(0).length
           val blockParser =
@@ -93,14 +92,13 @@ class WikiCodeBlockParser(
     val nextNonSpace = state.getNextNonSpaceIndex
     var newIndex = state.getIndex
     val line = state.getLine
-    var matcher: Matcher = null
     val matches =
       state.getIndent <= 3
       && nextNonSpace < line.length
 
     if matches then {
       val trySequence = line.subSequence(nextNonSpace, line.length)
-      matcher = WikiCodeBlockParser.CLOSING_FENCE.matcher(trySequence)
+      val matcher = WikiCodeBlockParser.CLOSING_FENCE.matcher(trySequence)
       if matcher.find then {
         val foundFenceLength = matcher.group(0).length
         if (foundFenceLength >= fenceLength) { // closing fence - we're at end of line, so we can finalize now
@@ -150,7 +148,7 @@ class WikiCodeBlockParser(
     }
     else block.setContent(content)
     block.setCharsFromContent
-    content = null
+    content = null.asInstanceOf[BlockContent] // release for GC
   }
 }
 

scaladoc/src/dotty/tools/scaladoc/renderers/SiteRenderer.scala

@@ -33,7 +33,7 @@ trait SiteRenderer(using DocContext) extends Locations:
 
     def tryAsDriPlain(str: String): Option[String] =
       val (path, prefix) = str match
-        case HashRegex(path, prefix) => (path, prefix)
+        case HashRegex(path: String, prefix: String) => (path, prefix)
         case _ => (str, "")
       val res = ctx.driForLink(content.template.file, path).filter(driExists)
       res.headOption.map(pathToPage(pageDri, _) + prefix)
@@ -46,7 +46,7 @@ trait SiteRenderer(using DocContext) extends Locations:
           case _ => str
 
       val (path, prefix) = newStr match
-        case HashRegex(path, prefix) => (path, prefix)
+        case HashRegex(path: String, prefix: String) => (path, prefix)
         case _ => (newStr, "")
 
       val res = ctx.driForLink(content.template.file, path).filter(driExists)

scaladoc/src/dotty/tools/scaladoc/renderers/Writer.scala

@@ -14,7 +14,7 @@ trait Writer(using ctx: DocContext) extends Locations:
   private val args = summon[DocContext].args
 
   private def dest(path: String) =
-    val absPath = args.output.toPath.resolve(path)
+    val absPath = args.output.nn.toPath.resolve(path)
     if !Files.exists(absPath.getParent) then Files.createDirectories(absPath.getParent)
     absPath
 

scaladoc/src/dotty/tools/scaladoc/site/BlogParser.scala

@@ -8,8 +8,8 @@ import scala.beans.{BooleanBeanProperty, BeanProperty}
 import scala.util.Try
 
 case class BlogConfig(
-  @BeanProperty input: String,
-  @BeanProperty output: String,
+  @BeanProperty input: String | Null,
+  @BeanProperty output: String | Null,
   @BooleanBeanProperty hidden: Boolean
 ):
   def this() = this(null, null, false)