Apply requested changes

Author: BarkingBad

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

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

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

@@ -17,9 +17,9 @@ trait NameNormalizer { self: TastyParser =>
   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,6 +16,8 @@ import org.junit.Test
 
 class RemoteLinksTest:
 
+  class TimeoutException extends Exception
+
   Random.setSeed(123L)
   val mtslAll = membersToSourceLinks(using testDocContext())
 
@@ -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