Skip to content

Fix dotty source links #12990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 2, 2021
Merged

Fix dotty source links #12990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,12 +1250,12 @@ object Build {
val dottyLib = (`scala3-library` / Compile / classDirectory).value
// 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) =
def scalaSrcLink(v: String, s: String) = s"-source-links:${s}github://scala/scala/v$v#src/library"
def dottySrcLink(v: String, sourcesPrefix: String = "", outputPrefix: 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"
s"-source-links:${sourcesPrefix}github://${sys.env("GITHUB_REPOSITORY")}/$sha$outputPrefix"
case None => s"-source-links:${sourcesPrefix}github://lampepfl/dotty/$v$outputPrefix"
}

val revision = Seq("-revision", ref, "-project-version", projectVersion)
Expand All @@ -1264,9 +1264,9 @@ object Build {
outDir,
"-project",
name,
scalaSrcLink(stdLibVersion, srcManaged(dottyNonBootstrappedVersion, "scala")),
dottySrcLink(referenceVersion, srcManaged(dottyNonBootstrappedVersion, "dotty")),
s"-source-links:github://lampepfl/dotty/$referenceVersion",
scalaSrcLink(stdLibVersion, srcManaged(dottyNonBootstrappedVersion, "scala") + "="),
dottySrcLink(referenceVersion, srcManaged(dottyNonBootstrappedVersion, "dotty") + "=", "#library/src"),
dottySrcLink(referenceVersion),
) ++ scalacOptionsDocSettings ++ revision ++ params ++ targets
import _root_.scala.sys.process._
val escapedCmd = cmd.map(arg => if(arg.contains(" ")) s""""$arg"""" else arg)
Expand Down
2 changes: 1 addition & 1 deletion scaladoc/test-source-links/dotty/tools/scaladoc/source-links/RemoteLinksTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class RemoteLinksTest:
@Test
def runTest =
assertTrue(mtslAll.nonEmpty)
val mtsl = randomGenerator.shuffle(mtslAll).take(40) // take 40 random entries
val mtsl = randomGenerator.shuffle(mtslAll).take(80) // take 80 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
Expand Down