Apply requested changes

Author: BarkingBad

project/Build.scala

@@ -1183,6 +1183,18 @@ object Build {
   val generateScalaDocumentation = inputKey[Unit]("Generate documentation for dotty lib")
   val generateTestcasesDocumentation  = taskKey[Unit]("Generate documentation for testcases, usefull for debugging tests")
 
+  lazy val `scaladoc-testcases` = project.in(file("scaladoc-testcases")).
+    dependsOn(`scala3-compiler-bootstrapped`).
+    settings(commonBootstrappedSettings)
+  lazy val `scaladoc-js` = project.in(file("scaladoc-js")).
+    enablePlugins(DottyJSPlugin).
+    dependsOn(`scala3-library-bootstrappedJS`).
+    settings(
+      Test / fork := false,
+      scalaJSUseMainModuleInitializer := true,
+      libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13)
+    )
+
   def generateDocumentation(targets: Seq[String], name: String, outDir: String, ref: String, params: Seq[String] = Nil) =
     Def.taskDyn {
       val distLocation = (dist / pack).value
@@ -1215,8 +1227,8 @@ object Build {
     dependsOn(`scala3-tasty-inspector`).
     settings(inConfig(SourceLinksIntegrationTest)(Defaults.testSettings)).
     settings(
-      scalaSource in SourceLinksIntegrationTest := baseDirectory.value / "test-source-links",
-      test in SourceLinksIntegrationTest := ((test in SourceLinksIntegrationTest) dependsOn generateScalaDocumentation.toTask("")).value,
+      SourceLinksIntegrationTest / scalaSource := baseDirectory.value / "test-source-links",
+      SourceLinksIntegrationTest / test:= ((SourceLinksIntegrationTest / test) dependsOn generateScalaDocumentation.toTask("")).value,
     ).
     settings(
       Compile / resourceGenerators += Def.task {

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

@@ -140,4 +140,3 @@ object SourceLinks:
         )
         SourceLinks(sourceLinks)
     }
-

scaladoc/src/dotty/tools/scaladoc/tasty/NameNormalizer.scala

@@ -21,9 +21,9 @@ object NameNormalizer {
   private val ignoredKeywords: Set[String] = Set("this")
 
   private def escapedName(name: String) =
-    val simpleIdentifierRegex = "([([{}]) ]|[^A-Za-z0-9$]_)".r
+    val complexIdentifierRegex = """([([{}]) ]|[^A-Za-z0-9$]_)""".r
     name match
       case n if ignoredKeywords(n) => n
-      case n if keywords(termName(n)) || simpleIdentifierRegex.findFirstIn(n).isDefined => s"`$n`"
+      case n if keywords(termName(n)) || complexIdentifierRegex.findFirstIn(n).isDefined => s"`$n`"
       case _ => name
 }

scaladoc/test-source-links/dotty/tools/scaladoc/source-links/RemoteLinksTest.scala

@@ -16,7 +16,9 @@ import org.junit.Test
 
 class RemoteLinksTest:
 
-  Random.setSeed(123L)
+  class TimeoutException extends Exception
+
+  val randomGenerator = new Random(125L)
   val mtslAll = membersToSourceLinks(using testDocContext())
 
   @Test
@@ -25,12 +27,12 @@ class RemoteLinksTest:
 
   @Test
   def scala3SourceLink =
-    assertTrue(mtslAll.find((k, _) => k == "FromDigits").isDefined) // source link to Scala3 stdlib class
+    assertTrue(mtslAll.find((k, _) => k == "PolyFunction").isDefined) // source link to Scala3 stdlib class
 
   @Test
   def runTest =
     assertTrue(mtslAll.nonEmpty)
-    val mtsl = Random.shuffle(mtslAll).take(20) // take 20 random entries
+    val mtsl = randomGenerator.shuffle(mtslAll).take(20) // take 20 random entries
     val pageToMtsl: Map[String, List[(String, String)]] = mtsl.groupMap(_._2.split("#L").head)(v => (v._1, v._2.split("#L").last))
     pageToMtsl.foreach { case (link, members) =>
       try
@@ -44,20 +46,23 @@ class RemoteLinksTest:
       catch
         case e: java.lang.IllegalArgumentException =>
           report.error(s"Could not open link for $link - invalid URL")(using testContext)
+        case e: TimeoutException =>
+          report.error(s"Tried to open link $link 16 times but with no avail")(using testContext)
         case e: org.jsoup.HttpStatusException => e.getStatusCode match
           case 404 => throw AssertionError(s"Page $link does not exists")
           case n   => report.warning(s"Could not open link for $link, return code $n")(using testContext)
     }
     assertNoErrors(testContext.reportedDiagnostics)
 
-  private def getDocumentFromUrl(link: String): Document =
+  private def getDocumentFromUrl(link: String, retries: Int = 16): Document =
     try
+      if retries == 0 then throw TimeoutException()
       Jsoup.connect(link).get
     catch
       case e: org.jsoup.HttpStatusException => e.getStatusCode match
           case 429 =>
             Thread.sleep(10)
-            getDocumentFromUrl(link)
+            getDocumentFromUrl(link, retries - 1)
           case n =>
             throw e