File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed
scala3doc/src/dotty/dokka Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -18,6 +18,7 @@ class ScalaModuleProvider(using ctx: DocContext) extends SourceToDocumentableTra
1818 override def invoke (sourceSet : DokkaSourceSet , cxt : DokkaContext , unused : Continuation [? >: DModule ]) =
1919 val result = DokkaTastyInspector (new MarkdownParser (_ => null )).result()
2020 val (rootPck, rest) = result.partition(_.name == " <empty>" )
21+ val packageMembers = (rest ++ rootPck.flatMap(_.allMembers)).sortBy(_.name)
2122
2223 def flattenMember (m : Member ): Seq [(DRI , Member )] = (m.dri -> m) +: m.allMembers.flatMap(flattenMember)
2324
@@ -31,7 +32,7 @@ class ScalaModuleProvider(using ctx: DocContext) extends SourceToDocumentableTra
3132 null ,
3233 JSet (ctx.sourceSet),
3334 PropertyContainer .Companion .empty()
34- ).withNewMembers(rest ++ rootPck.flatMap(_.allMembers) ).withKind(Kind .RootPackage ).asInstanceOf [DPackage ]
35+ ).withNewMembers(packageMembers ).withKind(Kind .RootPackage ).asInstanceOf [DPackage ]
3536
3637 new DModule (
3738 sourceSet.getDisplayName,
Original file line number Diff line number Diff line change @@ -58,9 +58,10 @@ case class DokkaTastyInspector(parser: Parser)(using ctx: DocContext) extends Do
5858 val all = topLevels.result()
5959 all.groupBy(_._1).map { case (pckName, members) =>
6060 val (pcks, rest) = members.map(_._2).partition(_.kind == Kind .Package )
61- pcks.reduce( (p1, p2) =>
61+ val basePck = pcks.reduce( (p1, p2) =>
6262 p1.withNewMembers(p2.allMembers) // TODO add doc
63- ).withNewMembers(rest)
63+ )
64+ basePck.withMembers((basePck.allMembers ++ rest).sortBy(_.name))
6465 }.toList
6566
6667/** Parses a single Tasty compilation unit. */
You can’t perform that action at this time.
0 commit comments