Skip to content

Commit 5fa080b

Browse files
committed
fix search packages
1 parent a60ef52 commit 5fa080b

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,19 +175,22 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
175175
def processMember(member: Member, fqName: List[String]): Seq[(JSON, Seq[String])] =
176176
val signature: MemberSignature = signatureProvider.rawSignature(member)()
177177
val sig = Signature(Plain(member.name)) ++ signature.suffix
178-
val descr = fqName.mkString(".")
178+
val descr = if member.kind == Kind.Package then "" else fqName.mkString(".")
179179
val entry = mkEntry(member.dri, member.name, flattenToText(sig), extensionTarget(member), descr, member.kind.name)
180180
val children = member
181181
.membersBy(m => m.kind != Kind.Package && !m.kind.isInstanceOf[Classlike])
182182
.filter(m => m.origin == Origin.RegularlyDefined && m.inheritedFrom.fold(true)(_.isSourceSuperclassHidden))
183-
val updatedFqName = fqName :+ member.name
183+
val updatedFqName = if member.kind == Kind.Package then List(member.name) else fqName :+ member.name
184184
Seq((entry, updatedFqName)) ++ children.flatMap(processMember(_, updatedFqName))
185185

186186
(processMember(m, pageFQName), m.name)
187187
case _ =>
188188
(Seq((mkEntry(page.link.dri, page.link.name, page.link.name, "", "", "static"), pageFQName)), "")
189189

190-
val updatedFqName = if !pageName.isEmpty then pageFQName :+ pageName else pageFQName
190+
val updatedFqName = page.content match
191+
case m: Member if m.kind == Kind.Package => List(m.name)
192+
case _ if pageName.isEmpty => pageFQName
193+
case _ => pageFQName :+ pageName
191194
res ++ page.children.flatMap(processPage(_, updatedFqName))
192195

193196
val entries = pages.flatMap(processPage(_, Nil))

0 commit comments

Comments
 (0)