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
18
18
override def invoke (sourceSet : DokkaSourceSet , cxt : DokkaContext , unused : Continuation [? >: DModule ]) =
19
19
val result = DokkaTastyInspector (new MarkdownParser (_ => null )).result()
20
20
val (rootPck, rest) = result.partition(_.name == " <empty>" )
21
+ val packageMembers = (rest ++ rootPck.flatMap(_.allMembers)).sortBy(_.name)
21
22
22
23
def flattenMember (m : Member ): Seq [(DRI , Member )] = (m.dri -> m) +: m.allMembers.flatMap(flattenMember)
23
24
@@ -31,7 +32,7 @@ class ScalaModuleProvider(using ctx: DocContext) extends SourceToDocumentableTra
31
32
null ,
32
33
JSet (ctx.sourceSet),
33
34
PropertyContainer .Companion .empty()
34
- ).withNewMembers(rest ++ rootPck.flatMap(_.allMembers) ).withKind(Kind .RootPackage ).asInstanceOf [DPackage ]
35
+ ).withNewMembers(packageMembers ).withKind(Kind .RootPackage ).asInstanceOf [DPackage ]
35
36
36
37
new DModule (
37
38
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
58
58
val all = topLevels.result()
59
59
all.groupBy(_._1).map { case (pckName, members) =>
60
60
val (pcks, rest) = members.map(_._2).partition(_.kind == Kind .Package )
61
- pcks.reduce( (p1, p2) =>
61
+ val basePck = pcks.reduce( (p1, p2) =>
62
62
p1.withNewMembers(p2.allMembers) // TODO add doc
63
- ).withNewMembers(rest)
63
+ )
64
+ basePck.withMembers((basePck.allMembers ++ rest).sortBy(_.name))
64
65
}.toList
65
66
66
67
/** Parses a single Tasty compilation unit. */
You can’t perform that action at this time.
0 commit comments