Skip to content

Commit 82ebe49

Browse files
committed
chore: drop patching scaladoc for previously patched symbols
1 parent 53bea78 commit 82ebe49

File tree

2 files changed

+2
-27
lines changed

2 files changed

+2
-27
lines changed

scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ trait ClassLikeSupport:
129129
if summon[DocContext].args.generateInkuire then doInkuireStuff(classDef)
130130

131131
if signatureOnly then baseMember else baseMember.copy(
132-
members = classDef.extractPatchedMembers.sortBy(m => (m.name, m.kind.name)),
132+
members = classDef.extractMembers.sortBy(m => (m.name, m.kind.name)),
133133
selfType = selfType,
134134
companion = classDef.getCompanion
135135
)
@@ -267,31 +267,6 @@ trait ClassLikeSupport:
267267
inherited.flatMap(s => parseInheritedMember(c)(s))
268268
}
269269

270-
/** Extracts members while taking Dotty logic for patching the stdlib into account. */
271-
def extractPatchedMembers: Seq[Member] = {
272-
val ownMembers = c.extractMembers
273-
def extractPatchMembers(sym: Symbol) = {
274-
// NOTE for some reason scala.language$.experimental$ class doesn't show up here, so we manually add the name
275-
val ownMemberDRIs = ownMembers.iterator.map(_.name).toSet + "experimental$"
276-
sym.tree.asInstanceOf[ClassDef]
277-
.membersToDocument.filterNot(m => ownMemberDRIs.contains(m.symbol.name))
278-
.flatMap(parseMember(c))
279-
}
280-
c.symbol.fullName match {
281-
case "scala.Predef$" =>
282-
ownMembers ++
283-
extractPatchMembers(qctx.reflect.Symbol.requiredClass("scala.runtime.stdLibPatches.Predef$"))
284-
case "scala.language$" =>
285-
ownMembers ++
286-
extractPatchMembers(qctx.reflect.Symbol.requiredModule("scala.runtime.stdLibPatches.language").moduleClass)
287-
case "scala.language$.experimental$" =>
288-
ownMembers ++
289-
extractPatchMembers(qctx.reflect.Symbol.requiredModule("scala.runtime.stdLibPatches.language.experimental").moduleClass)
290-
case _ => ownMembers
291-
}
292-
293-
}
294-
295270
def getTreeOfFirstParent: Option[Tree] =
296271
c.getParentsAsTreeSymbolTuples.headOption.map(_._1)
297272

scaladoc/src/dotty/tools/scaladoc/tasty/TastyParser.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ case class ScaladocTastyInspector()(using ctx: DocContext) extends Inspector:
135135
def mergeAnyRefAliasAndObject(parser: TastyParser) =
136136
import parser.qctx.reflect._
137137
val javaLangObjectDef = defn.ObjectClass.tree.asInstanceOf[ClassDef]
138-
val objectMembers = parser.extractPatchedMembers(javaLangObjectDef)
138+
val objectMembers = javaLangObjectDef.extractMembers
139139
val aM = parser.parseTypeDef(
140140
defn.AnyRefClass.tree.asInstanceOf[TypeDef],
141141
defn.AnyClass.tree.asInstanceOf[ClassDef],

0 commit comments

Comments
 (0)