Skip to content

Commit 0b2ff04

Browse files
committed
Fix source links for stdlib
1 parent 1440699 commit 0b2ff04

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

project/Build.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1614,10 +1614,12 @@ object Build {
16141614
IO.createDirectory(file(outDir))
16151615
val scala3version = 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+
val srcManaged213 = s"out/bootstrap/stdlib-bootstrapped/scala-$referenceVersion/src_managed/main/scala-library-src"
1618+
val srcManaged3 = s"out/bootstrap/stdlib-bootstrapped/scala-$dottyNonBootstrappedVersion/src_managed/main/dotty-library-src"
1619+
val sourceLinks213 = s"-source-links:$srcManaged213=github://scala/scala/v${stdlibVersion(Bootstrapped)}#src/library"
1620+
val sourceLinks3 = s"-source-links:$srcManaged3=github://scala/scala/$referenceVersion#library/src"
16191621
val revision = Seq("-revision", ref, "-project-version", projectVersion)
1620-
val cmd = Seq("-d", outDir, "-project", name, sourceLinks) ++ scalacOptionsDocSettings ++ revision ++ params ++ targets
1622+
val cmd = Seq("-d", outDir, "-project", name, sourceLinks213, sourceLinks3) ++ scalacOptionsDocSettings ++ revision ++ params ++ targets
16211623
import _root_.scala.sys.process._
16221624
Def.task((s"$distLocation/bin/scaladoc" +: cmd).!)
16231625
}

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)