Use the new stdlib when generating scaladoc #23744
Conversation
| //s"${dottyLibRoot}=markdown", | ||
| //s"${stdLibRoot}=wiki", |
There was a problem hiding this comment.
Unfortunately, we cannot have both syntax available in the same sources... for now we just kept the default one until we find a better solution.
| //.add(SnippetCompiler(List( | ||
| //s"$dottyLibRoot/src/scala=compile", | ||
| //s"$dottyLibRoot/src/scala/compiletime=compile", | ||
| //s"$dottyLibRoot/src/scala/util=compile", | ||
| //s"$dottyLibRoot/src/scala/util/control=compile" | ||
| //))) |
There was a problem hiding this comment.
We disable the snippet compiler for now too.
There was a problem hiding this comment.
When can we turn it back on?
There was a problem hiding this comment.
When we determine the set of packages we need to enable it for.
| /** Extracts members while taking Dotty logic for patching the stdlib into account. */ | ||
| def extractPatchedMembers: Seq[Member] = { | ||
| val ownMembers = c.extractMembers | ||
| def extractPatchMembers(sym: Symbol) = { | ||
| // NOTE for some reason scala.language$.experimental$ class doesn't show up here, so we manually add the name | ||
| val ownMemberDRIs = ownMembers.iterator.map(_.name).toSet + "experimental$" | ||
| sym.tree.asInstanceOf[ClassDef] | ||
| .membersToDocument.filterNot(m => ownMemberDRIs.contains(m.symbol.name)) | ||
| .flatMap(parseMember(c)) | ||
| } | ||
| c.symbol.fullName match { | ||
| case "scala.Predef$" => | ||
| ownMembers ++ | ||
| extractPatchMembers(qctx.reflect.Symbol.requiredClass("scala.runtime.stdLibPatches.Predef$")) | ||
| case "scala.language$" => | ||
| ownMembers ++ | ||
| extractPatchMembers(qctx.reflect.Symbol.requiredModule("scala.runtime.stdLibPatches.language").moduleClass) | ||
| case "scala.language$.experimental$" => | ||
| ownMembers ++ | ||
| extractPatchMembers(qctx.reflect.Symbol.requiredModule("scala.runtime.stdLibPatches.language.experimental").moduleClass) | ||
| case _ => ownMembers | ||
| } | ||
|
|
||
| } | ||
|
|
There was a problem hiding this comment.
The new stdlib doesn't patch anymore, we can remove the logic here.
| //.add(SnippetCompiler(List( | ||
| //s"$dottyLibRoot/src/scala=compile", | ||
| //s"$dottyLibRoot/src/scala/compiletime=compile", | ||
| //s"$dottyLibRoot/src/scala/util=compile", | ||
| //s"$dottyLibRoot/src/scala/util/control=compile" | ||
| //))) |
There was a problem hiding this comment.
When can we turn it back on?
| } | ||
|
|
||
| lazy val DefaultGenerationConfig = Def.task { | ||
| def distLocation = (dist / Universal / stage).value |
There was a problem hiding this comment.
The build failed because this had the side effect of being executed (which is obviously an sbt bug and why I removed it) but the CI workflow relies on this buggy effect.
I'm updating the CI workflow file to publish the commands locally before testing.
There was a problem hiding this comment.
I just checked with @eed3si9n and this is a very very interesting case as it works as expected... since the sbt semantics are not the scala semantics. Still weird for me.
3 participants
In this PR, we use the new stdlib project to generate the scaladoc and website of scala 3.
The previous build used
scala2-library-bootstrappedto fetch have tasty files available. We change this by now using the real, and to be, TASTy files for the stdlib.This changes will already take effect in the first run after the merge of this PR.