Merge entries

Kotlin · Jan 19, 2022 · 3be10e0 · 3be10e0
1 parent d7c049e
commit 3be10e0
Showing 1 changed file with 30 additions and 21 deletions.
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -39,19 +39,24 @@ open class DefaultPageCreator(
     protected val separateInheritedMembers =
         configuration?.separateInheritedMembers ?: DokkaBaseConfiguration.separateInheritedMembersDefault
 
-    open fun pageForModule(m: DModule) =
-        ModulePageNode(m.name.ifEmpty { "<root>" }, contentForModule(m), m, m.packages.map(::pageForPackage))
-
-    open fun pageForPackage(p: DPackage): PackagePageNode = PackagePageNode(
-        p.name, contentForPackage(p), setOf(p.dri), p,
-        if (mergeNoExpectActualDeclarations)
-            p.classlikes.mergeClashingDocumentable().map(::pageForClasslikesAndEntries) +
-                    p.functions.mergeClashingDocumentable().map(::pageForFunctions) +
-                    p.properties.mergeClashingDocumentable().map(::pageForProperties)
-        else p.classlikes.renameClashingDocumentable().map(::pageForClasslike) +
-                p.functions.renameClashingDocumentable().map(::pageForFunction) +
-                p.properties.mapNotNull(::pageForProperty)
-    )
+    open fun pageForModule(m: DModule): ModulePageNode {
+        logger.error("DModule: ${m.name} ")
+        return ModulePageNode(m.name.ifEmpty { "<root>" }, contentForModule(m), m, m.packages.map(::pageForPackage))
+    }
+    open fun pageForPackage(p: DPackage): PackagePageNode {
+         logger.error("DPackage: ${p.dri} from ${p.sourceSets} ")
+        p.functions.filter { it.name == "listOf" }.forEach {  logger.error("lili: ${it.dri} from ${it.sourceSets} ") }
+        return PackagePageNode(
+            p.name, contentForPackage(p), setOf(p.dri), p,
+            if (mergeNoExpectActualDeclarations)
+                p.classlikes.mergeClashingDocumentable().map(::pageForClasslikesAndEntries) +
+                        p.functions.mergeClashingDocumentable().map(::pageForFunctions) +
+                        p.properties.mergeClashingDocumentable().map(::pageForProperties)
+            else p.classlikes.renameClashingDocumentable().map(::pageForClasslike) +
+                    p.functions.renameClashingDocumentable().map(::pageForFunction) +
+                    p.properties.mapNotNull(::pageForProperty)
+        )
+    }
 
     open fun pageForEnumEntry(e: DEnumEntry): ClasslikePageNode =
         ClasslikePageNode(
@@ -138,6 +143,8 @@ open class DefaultPageCreator(
     open fun pageForFunction(f: DFunction) = MemberPageNode(f.nameAfterClash(), contentForFunction(f), setOf(f.dri), f)
 
     open fun pageForFunctions(fs: List<DFunction>): MemberPageNode {
+        fs.filter { it.name == "listOf" }.forEach {  logger.error("lifli: ${it.dri} from ${it.sourceSets} ") }
+
         val dri = fs.dri.also { if (it.size != 1) {
             logger.error("Function dri should have the same one ${it.first()} inside the one page!")
         } }
@@ -390,26 +397,28 @@ open class DefaultPageCreator(
                 }
                 val csEnum = cs.filterIsInstance<DEnum>()
                 if (csEnum.isNotEmpty()) {
-                    block(
+                    multiBlock(
                         "Entries",
                         2,
                         ContentKind.Classlikes,
-                        csEnum.flatMap { it.entries },
+                        csEnum.flatMap { it.entries }.groupBy { it.name }.toList(),
                         csEnum.sourceSets,
                         needsSorting = false,
                         needsAnchors = true,
                         extra = mainExtra + SimpleAttr.header("Entries"),
                         styles = emptySet()
-                    ) {
-                        link(it.name, it.dri)
+                    ) { key, ds ->
+                        link(key, ds.first().dri)
                         sourceSetDependentHint(
-                            it.dri,
-                            it.sourceSets.toSet(),
+                            ds.dri,
+                            ds.sourceSets,
                             kind = ContentKind.SourceSetDependentHint,
                             extra = PropertyContainer.empty<ContentNode>()
                         ) {
-                            +buildSignature(it)
-                            contentForBrief(it)
+                            ds.forEach {
+                                +buildSignature(it)
+                                contentForBrief(it)
+                            }
                         }
                     }
                 }