Skip to content

Commit 807d258

Browse files
committed
Do not display empty packages
1 parent 53987fe commit 807d258

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

scala3doc/src/dotty/dokka/ScalaModuleCreator.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ object ScalaModuleProvider:
1010
def mkModule()(using ctx: DocContext): Module =
1111
val (result, rootDoc) = DokkaTastyInspector().result()
1212
val (rootPck, rest) = result.partition(_.name == "API")
13-
val packageMembers = (rest ++ rootPck.flatMap(_.members)).sortBy(_.name)
13+
val packageMembers = (rest ++ rootPck.flatMap(_.members))
14+
.filter(p => p.members.nonEmpty || p.docs.nonEmpty).sortBy(_.name)
1415

1516
def flattenMember(m: Member): Seq[(DRI, Member)] = (m.dri -> m) +: m.members.flatMap(flattenMember)
1617

scala3doc/src/dotty/dokka/site/StaticSiteContext.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class StaticSiteContext(
128128
private def loadAllFiles() =
129129
def dir(name: String)= List(new File(root, name)).filter(_.isDirectory)
130130
dir("docs").flatMap(_.listFiles()).flatMap(loadTemplate(_, isBlog = false))
131-
++ dir("blog").flatMap(loadTemplate(_, isBlog = true))
131+
++ dir("blog").flatMap(loadTemplate(_, isBlog = true)).sortBy(_.templateFile.title)
132132

133133
def driForLink(template: TemplateFile, link: String): Seq[DRI] =
134134
val pathsDri: Option[Seq[DRI]] = Try {

0 commit comments

Comments
 (0)