Skip to content

Commit 544874c

Browse files
committed
Fix source links for stdlib
1 parent 1440699 commit 544874c

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

project/Build.scala

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,12 +1612,21 @@ object Build {
16121612
val distLocation = (dist / pack).value
16131613
val projectVersion = version.value
16141614
IO.createDirectory(file(outDir))
1615-
val scala3version = stdlibVersion(Bootstrapped)
1615+
val stdLibVersion = stdlibVersion(Bootstrapped)
16161616
// TODO add versions etc.
1617-
val srcManaged = s"out/bootstrap/stdlib-bootstrapped/scala-$baseVersion/src_managed/main/scala-library-src"
1618-
val sourceLinks = s"-source-links:$srcManaged=github://scala/scala/v${stdlibVersion(Bootstrapped)}#src/library"
1617+
def srcManaged(v: String, s: String) = s"out/bootstrap/stdlib-bootstrapped/scala-$v/src_managed/main/$s-library-src"
1618+
def scalaSrcLink(v: String, s: String) = s"-source-links:$s=github://scala/scala/v$v#src/library"
1619+
def dottySrcLink(v: String, s: String) = s"-source-links:$s=github://lampepfl/dotty/v$v#src/library"
16191620
val revision = Seq("-revision", ref, "-project-version", projectVersion)
1620-
val cmd = Seq("-d", outDir, "-project", name, sourceLinks) ++ scalacOptionsDocSettings ++ revision ++ params ++ targets
1621+
val cmd = Seq(
1622+
"-d",
1623+
outDir,
1624+
"-project",
1625+
name,
1626+
scalaSrcLink(stdLibVersion, srcManaged(referenceVersion, "scala")),
1627+
dottySrcLink(referenceVersion, srcManaged(dottyNonBootstrappedVersion, "scala")),
1628+
dottySrcLink(referenceVersion, srcManaged(dottyNonBootstrappedVersion, "dotty"))
1629+
) ++ scalacOptionsDocSettings ++ revision ++ params ++ targets
16211630
import _root_.scala.sys.process._
16221631
Def.task((s"$distLocation/bin/scaladoc" +: cmd).!)
16231632
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import java.nio.file.{Path, Paths}
44

55
case class PathBased[T](entries: List[PathBased.Entry[T]], projectRoot: Path):
66
def get(path: Path): Option[PathBased.Result[T]] =
7+
println(path)
8+
println(entries)
79
if path.isAbsolute then
810
if path.startsWith(projectRoot) then get(projectRoot.relativize(path))
911
else None
@@ -36,4 +38,4 @@ object PathBased:
3638
}.toList
3739

3840
ParsingResult(errors, PathBased(entries, projectRoot))
39-
}
41+
}

0 commit comments

Comments
 (0)