Skip to content

Commit ae34440

Browse files
committed
Scala3doc: fix issues with loading stdlib
1 parent 1fb2631 commit ae34440

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

compiler/src/scala/quoted/internal/impl/QuoteContextImpl.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2001,16 +2001,16 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext, QuoteUnpickl
20012001

20022002
object TypeBounds extends TypeBoundsModule:
20032003
def apply(low: TypeRepr, hi: TypeRepr): TypeBounds = Types.TypeBounds(low, hi)
2004-
def unapply(x: TypeBounds): Option[(TypeRepr, TypeRepr)] = Some((x.low, x.hi))
2004+
def unapply(x: TypeBounds): Option[(TypeRepr, TypeRepr)] = Some((x.low.stripLazyRef, x.hi.stripLazyRef))
20052005
def empty: TypeBounds = Types .TypeBounds.empty
20062006
def upper(hi: TypeRepr): TypeBounds = Types .TypeBounds.upper(hi)
20072007
def lower(lo: TypeRepr): TypeBounds = Types .TypeBounds.lower(lo)
20082008
end TypeBounds
20092009

20102010
object TypeBoundsMethodsImpl extends TypeBoundsMethods:
20112011
extension (self: TypeBounds):
2012-
def low: TypeRepr = self.lo
2013-
def hi: TypeRepr = self.hi
2012+
def low: TypeRepr = self.lo.stripLazyRef
2013+
def hi: TypeRepr = self.hi.stripLazyRef
20142014
end extension
20152015
end TypeBoundsMethodsImpl
20162016

project/Build.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,8 +1506,7 @@ object Build {
15061506
(`scala3-interfaces`/Compile/products).value,
15071507
(`tasty-core-bootstrapped`/Compile/products).value,
15081508
(`scala3-library-bootstrapped`/Compile/products).value,
1509-
// TODO we can't load stdlib from Tasty
1510-
// (`stdlib-bootstrapped`/Compile/products).value,
1509+
(`stdlib-bootstrapped`/Compile/products).value,
15111510
).flatten
15121511

15131512
val roots = joinProducts(dottyJars)

scala3doc/src/dotty/dokka/tasty/TypesSupport.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ trait TypesSupport:
104104
case r: Refinement => { //(parent, name, info)
105105
def getRefinementInformation(t: TypeRepr): List[TypeRepr] = t match {
106106
case r: Refinement => getRefinementInformation(r.parent) :+ r
107-
case tr: TypeRef => List(tr)
107+
case t => List(t)
108108
}
109109

110110
def getParamBounds(t: PolyType): List[JProjection] = commas(

scala3doc/src/dotty/dokka/tasty/comments/MemberLookup.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ trait MemberLookup {
6464
import dotty.tools.dotc
6565
given dotc.core.Contexts.Context = rootContext.asInstanceOf
6666
val sym = rsym.asInstanceOf[dotc.core.Symbols.Symbol]
67-
val members = sym.info.decls.iterator
67+
val members = sym.info.decls.iterator.filter(_.denot.isAbsent(false))
6868
// println(s"members of ${sym.show} : ${members.map(_.show).mkString(", ")}")
6969
members.asInstanceOf[Iterator[Symbol]]
7070
}

0 commit comments

Comments
 (0)