Search for name in range of lines and add flexible sourcelinks

Author: romanowski

docs/blog/index.html

@@ -9,7 +9,7 @@ <h1>{{ page.title }}</h1>
         {% for post in site.posts %}
             <li>
                 <h2>
-                    <a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a>
+                    <a href="{{ post.url }}">{{ post.title }}</a>
                 </h2>
                 <div class="byline">
                     <time class="date">

project/Build.scala

@@ -1244,7 +1244,12 @@ object Build {
       // TODO add versions etc.
       def srcManaged(v: String, s: String) = s"out/bootstrap/stdlib-bootstrapped/scala-$v/src_managed/main/$s-library-src"
       def scalaSrcLink(v: String, s: String) = s"-source-links:$s=github://scala/scala/v$v#src/library"
-      def dottySrcLink(v: String, s: String) = s"-source-links:$s=github://lampepfl/dotty/$v#library/src"
+      def dottySrcLink(v: String, s: String) =
+        sys.env.get("GITHUB_SHA") match {
+          case Some(sha) =>
+            s"-source-links:$s=github://${sys.env("GITHUB_REPOSITORY")}/$sha#library/src"
+          case None => s"-source-links:$s=github://lampepfl/dotty/$v#library/src"
+        }
 
       val revision = Seq("-revision", ref, "-project-version", projectVersion)
       val cmd = Seq(

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

@@ -19,7 +19,8 @@ class RemoteLinksTest:
   class TimeoutException extends Exception
 
   val randomGenerator = new Random(125L)
-  val mtslAll = membersToSourceLinks(using testDocContext())
+  // Predef has often problems with positions
+  val mtslAll = membersToSourceLinks(using testDocContext()).filter(_._1 != "Predef")
 
   @Test
   def scala213XSourceLink =
@@ -36,16 +37,23 @@ class RemoteLinksTest:
   @Test
   def runTest =
     assertTrue(mtslAll.nonEmpty)
-    val mtsl = randomGenerator.shuffle(mtslAll).take(20) // take 20 random entries
+    val mtsl = randomGenerator.shuffle(mtslAll).take(40) // take 40 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
         val doc = getDocumentFromUrl(link)
-        members.foreach { (member, line) =>
+        println(s"Checking $link")
+        members.foreach { case (member, expectedLine) =>
           if !member.startsWith("given_") then // TODO: handle synthetic givens, for now we disable them from testing
-            val loc = doc.select(s"#LC$line").text
+            val toLine = expectedLine + 3
             val memberToMatch = member.replace("`", "")
-            assertTrue(s"Expected to find $memberToMatch at $link at line $line", loc.contains(memberToMatch))
+            val lineCorrectlyDefined = (expectedLine.toInt until toLine.toInt).exists{ line =>
+              val loc = doc.select(s"#LC$line").text
+
+              loc.contains(memberToMatch)
+            }
+
+            assertTrue(s"Expected to find $memberToMatch at $link at lines $expectedLine-$toLine", lineCorrectlyDefined)
         }
       catch
         case e: java.lang.IllegalArgumentException =>