From 929764085298cbd8f2660aff281f7714909dc412 Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Wed, 19 Jan 2022 00:39:46 +0300
Subject: [PATCH 01/17] Add option to merge no expect-actual declarations

---
 .../src/main/kotlin/DokkaBaseConfiguration.kt |   4 +-
 .../SameMethodNamePageMergerStrategy.kt       |   6 +-
 .../documentables/DefaultPageCreator.kt       | 429 ++++++++++++------
 .../documentables/PageContentBuilder.kt       |  39 ++
 4 files changed, 331 insertions(+), 147 deletions(-)

diff --git a/plugins/base/src/main/kotlin/DokkaBaseConfiguration.kt b/plugins/base/src/main/kotlin/DokkaBaseConfiguration.kt
index 21757d702f..86a6016a1b 100644
--- a/plugins/base/src/main/kotlin/DokkaBaseConfiguration.kt
+++ b/plugins/base/src/main/kotlin/DokkaBaseConfiguration.kt
@@ -8,12 +8,14 @@ data class DokkaBaseConfiguration(
     var customStyleSheets: List<File> = defaultCustomStyleSheets,
     var customAssets: List<File> = defaultCustomAssets,
     var separateInheritedMembers: Boolean = separateInheritedMembersDefault,
-    var footerMessage: String = defaultFooterMessage
+    var footerMessage: String = defaultFooterMessage,
+    var mergeNoExpectActualDeclarations: Boolean = mergeNoExpectActualDeclarationsDefault
 ) : ConfigurableBlock {
     companion object {
         val defaultFooterMessage = "© ${Year.now().value} Copyright"
         val defaultCustomStyleSheets: List<File> = emptyList()
         val defaultCustomAssets: List<File> = emptyList()
         const val separateInheritedMembersDefault: Boolean = false
+        const val mergeNoExpectActualDeclarationsDefault: Boolean = false
     }
 }
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/transformers/pages/merger/SameMethodNamePageMergerStrategy.kt b/plugins/base/src/main/kotlin/transformers/pages/merger/SameMethodNamePageMergerStrategy.kt
index 2fb70fc841..3b83050388 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/merger/SameMethodNamePageMergerStrategy.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/merger/SameMethodNamePageMergerStrategy.kt
@@ -37,9 +37,9 @@ class SameMethodNamePageMergerStrategy(val logger: DokkaLogger) : PageMergerStra
             .reduce { acc, node ->
                 acc.mapTransform<ContentDivergentGroup, ContentNode> { g ->
                     g.copy(children = (g.children +
-                            (node.dfs { it is ContentDivergentGroup && it.groupID == g.groupID } as? ContentDivergentGroup)
-                                ?.children?.single()
-                            ).filterNotNull()
+                            ((node.dfs { it is ContentDivergentGroup && it.groupID == g.groupID } as? ContentDivergentGroup)
+                                ?.children ?: emptyList())
+                            )
                     )
                 }
             }
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index e2aca6f9f7..5fe6db7167 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -1,7 +1,11 @@
 package org.jetbrains.dokka.base.translators.documentables
 
+import org.jetbrains.dokka.DokkaConfiguration.DokkaSourceSet
+import org.jetbrains.dokka.base.DokkaBaseConfiguration
+import org.jetbrains.dokka.base.resolvers.anchors.SymbolAnchorHint
 import org.jetbrains.dokka.base.signatures.SignatureProvider
 import org.jetbrains.dokka.base.transformers.documentables.CallableExtensions
+import org.jetbrains.dokka.base.transformers.documentables.ClashingDriIdentifier
 import org.jetbrains.dokka.base.transformers.documentables.InheritorsInfo
 import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
 import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder.DocumentableContentBuilder
@@ -15,11 +19,6 @@ import org.jetbrains.dokka.utilities.DokkaLogger
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import kotlin.reflect.KClass
 import kotlin.reflect.full.isSubclassOf
-import org.jetbrains.dokka.DokkaConfiguration.DokkaSourceSet
-import org.jetbrains.dokka.base.DokkaBaseConfiguration
-import org.jetbrains.dokka.base.resolvers.anchors.SymbolAnchorHint
-import org.jetbrains.dokka.base.transformers.documentables.ClashingDriIdentifier
-import org.jetbrains.dokka.base.transformers.pages.tags.CustomTagContentProvider
 
 private typealias GroupedTags = Map<KClass<out TagWrapper>, List<Pair<DokkaSourceSet?, TagWrapper>>>
 
@@ -35,6 +34,9 @@ open class DefaultPageCreator(
 ) {
     protected open val contentBuilder = PageContentBuilder(commentsToContentConverter, signatureProvider, logger)
 
+    protected val mergeNoExpectActualDeclarations =
+        configuration?.mergeNoExpectActualDeclarations ?: DokkaBaseConfiguration.mergeNoExpectActualDeclarationsDefault
+
     protected val separateInheritedMembers =
         configuration?.separateInheritedMembers ?: DokkaBaseConfiguration.separateInheritedMembersDefault
 
@@ -43,9 +45,13 @@ open class DefaultPageCreator(
 
     open fun pageForPackage(p: DPackage): PackagePageNode = PackagePageNode(
         p.name, contentForPackage(p), setOf(p.dri), p,
-        p.classlikes.renameClashingDocumentable().map(::pageForClasslike) +
-                p.functions.renameClashingDocumentable()
-                    .map(::pageForFunction) + p.properties.mapNotNull(::pageForProperty)
+        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 =
@@ -70,32 +76,85 @@ open class DefaultPageCreator(
         )
     }
 
+    open fun pageForClasslikesAndEntries(documentables: List<Documentable>): ClasslikePageNode {
+        val dri = documentables.dri.also {
+            if (it.size != 1) {
+                logger.error("Documentable dri should have the same one ${it.first()} inside the one page!")
+            }
+        }
+
+        val constructors = documentables.flatMap { if (it is WithConstructors) it.constructors else emptyList() }
+        @Suppress("UNCHECKED_CAST")
+        val scopes = documentables as List<WithScope>
+
+        val classlikes = scopes.flatMap { it.classlikes }
+        val functions = scopes.flatMap { it.filteredFunctions }
+        val props = scopes.flatMap { it.filteredProperties }
+        val entries = scopes.flatMap { if (it is DEnum) it.entries else emptyList() }
+
+        val childrenPages = constructors.map(::pageForFunction) +
+                if (mergeNoExpectActualDeclarations)
+                    (classlikes + entries).mergeClashingDocumentable().map(::pageForClasslikesAndEntries) +
+                            functions.mergeClashingDocumentable().map(::pageForFunctions) +
+                            props.mergeClashingDocumentable().map(::pageForProperties)
+                else
+                    classlikes.renameClashingDocumentable().map(::pageForClasslike) +
+                            functions.renameClashingDocumentable().map(::pageForFunction) +
+                            props.renameClashingDocumentable().mapNotNull(::pageForProperty) +
+                            entries.renameClashingDocumentable().map(::pageForEnumEntry)
+
+
+        return ClasslikePageNode(
+            documentables.first().nameAfterClash(), contentForClasslikesAndEntries(documentables), dri, documentables.singleOrNull(),
+            childrenPages
+        )
+    }
+
     private fun <T> T.toClashedName() where T : Documentable, T : WithExtraProperties<T> =
         (extra[ClashingDriIdentifier]?.value?.joinToString(", ", "[", "]") { it.displayName } ?: "") + name.orEmpty()
 
-    @Suppress("UNCHECKED_CAST")
     private fun <T : Documentable> List<T>.renameClashingDocumentable(): List<T> =
         groupBy { it.dri }.values.flatMap { elements ->
             if (elements.size == 1) elements else elements.mapNotNull { element ->
-                when (element) {
-                    is DClass -> element.copy(extra = element.extra + DriClashAwareName(element.toClashedName()))
-                    is DObject -> element.copy(extra = element.extra + DriClashAwareName(element.toClashedName()))
-                    is DAnnotation -> element.copy(extra = element.extra + DriClashAwareName(element.toClashedName()))
-                    is DInterface -> element.copy(extra = element.extra + DriClashAwareName(element.toClashedName()))
-                    is DEnum -> element.copy(extra = element.extra + DriClashAwareName(element.toClashedName()))
-                    is DFunction -> element.copy(extra = element.extra + DriClashAwareName(element.toClashedName()))
-                    is DProperty -> element.copy(extra = element.extra + DriClashAwareName(element.toClashedName()))
-                    is DTypeAlias -> element.copy(extra = element.extra + DriClashAwareName(element.toClashedName()))
-                    else -> null
-                } as? T?
+                element.renameClashingDocumentable()
             }
         }
 
+    @Suppress("UNCHECKED_CAST")
+    private fun <T : Documentable>  T.renameClashingDocumentable():T? = when (this) {
+        is DClass -> copy(extra = this.extra + DriClashAwareName(this.toClashedName()))
+        is DObject -> copy(extra = this.extra + DriClashAwareName(this.toClashedName()))
+        is DAnnotation -> copy(extra = this.extra + DriClashAwareName(this.toClashedName()))
+        is DInterface -> copy(extra = this.extra + DriClashAwareName(this.toClashedName()))
+        is DEnum -> copy(extra = this.extra + DriClashAwareName(this.toClashedName()))
+        is DFunction -> copy(extra = this.extra + DriClashAwareName(this.toClashedName()))
+        is DProperty -> copy(extra = this.extra + DriClashAwareName(this.toClashedName()))
+        is DTypeAlias -> copy(extra = this.extra + DriClashAwareName(this.toClashedName()))
+        else -> null
+    } as? T?
+
+    private fun <T : Documentable> List<T>.mergeClashingDocumentable(): List<List<T>> =
+        groupBy { it.dri }.values.toList()
+
     open fun pageForFunction(f: DFunction) = MemberPageNode(f.nameAfterClash(), contentForFunction(f), setOf(f.dri), f)
 
+    open fun pageForFunctions(fs: List<DFunction>): MemberPageNode {
+        val dri = fs.dri.also { if (it.size != 1) {
+            logger.error("Function dri should have the same one ${it.first()} inside the one page!")
+        } }
+        return MemberPageNode(fs.first().nameAfterClash(), contentForMembers(fs), dri, fs.singleOrNull())
+    }
+
     open fun pageForProperty(p: DProperty): MemberPageNode? =
         MemberPageNode(p.nameAfterClash(), contentForProperty(p), setOf(p.dri), p)
 
+    open fun pageForProperties(ps: List<DProperty>): MemberPageNode {
+        val dri = ps.dri.also { if (it.size != 1) {
+            logger.error("Property dri should have the same one ${it.first()} inside the one page!")
+        } }
+       return MemberPageNode(ps.first().nameAfterClash(), contentForMembers(ps), dri, ps.singleOrNull())
+    }
+
     private fun <T> T.isInherited(): Boolean where T : Documentable, T : WithExtraProperties<T> =
         sourceSets.all { sourceSet -> extra[InheritedMember]?.isInherited(sourceSet) == true }
 
@@ -168,54 +227,95 @@ open class DefaultPageCreator(
         }
     }
 
+    protected open fun contentForScopes(
+        scopes: List<WithScope>,
+        sourceSets: Set<DokkaSourceSet>
+    ): ContentGroup {
+        val types = listOf(
+            scopes.flatMap { it.classlikes },
+            scopes.filterIsInstance<DPackage>().flatMap { it.typealiases }
+        ).flatten()
+        val inheritors = scopes.fold(HashMap<DokkaSourceSet, List<DRI>>()) { acc, scope ->
+            val inheritorsForScope = scope.safeAs<WithExtraProperties<Documentable>>()?.let { it.extra[InheritorsInfo] }?.let { inheritors ->
+                inheritors.value.filter { it.value.isNotEmpty() }
+            }.orEmpty()
+            inheritorsForScope.forEach { (k,v) ->
+                acc[k]?.plus(v) ?: acc.put(k,v)
+            }
+            acc
+        }
+
+        return contentForScope(
+            @Suppress("UNCHECKED_CAST")
+            (scopes as List<Documentable>).dri,
+            sourceSets,
+            types,
+            scopes.flatMap { it.functions },
+            scopes.flatMap { it.properties },
+            inheritors
+        )
+    }
+
     protected open fun contentForScope(
         s: WithScope,
         dri: DRI,
         sourceSets: Set<DokkaSourceSet>
-    ) = contentBuilder.contentFor(s as Documentable) {
+    ): ContentGroup {
         val types = listOf(
             s.classlikes,
             (s as? DPackage)?.typealiases ?: emptyList()
         ).flatten()
+        val inheritors = s.safeAs<WithExtraProperties<Documentable>>()?.let { it.extra[InheritorsInfo] }?.let { inheritors ->
+           inheritors.value.filter { it.value.isNotEmpty() }
+        }.orEmpty()
+
+       return contentForScope(setOf(dri), sourceSets, types, s.functions, s.properties, inheritors)
+    }
+
+    protected open fun contentForScope(
+        dri: Set<DRI>,
+        sourceSets: Set<DokkaSourceSet>,
+        types: List<Documentable>,
+        functions: List<DFunction>,
+        properties: List<DProperty>,
+        inheritors: SourceSetDependent<List<DRI>>
+    ) = contentBuilder.contentFor(dri, sourceSets) {
         divergentBlock("Types", types, ContentKind.Classlikes, extra = mainExtra + SimpleAttr.header("Types"))
         if (separateInheritedMembers) {
-            val (inheritedFunctions, memberFunctions) = s.functions.splitInherited()
-            val (inheritedProperties, memberProperties) = s.properties.splitInherited()
+            val (inheritedFunctions, memberFunctions) = functions.splitInherited()
+            val (inheritedProperties, memberProperties) = properties.splitInherited()
             propertiesBlock("Properties", memberProperties, sourceSets)
             propertiesBlock("Inherited properties", inheritedProperties, sourceSets)
             functionsBlock("Functions", memberFunctions)
             functionsBlock("Inherited functions", inheritedFunctions)
         } else {
-            functionsBlock("Functions", s.functions)
-            propertiesBlock("Properties", s.properties, sourceSets)
+            functionsBlock("Functions", functions)
+            propertiesBlock("Properties", properties, sourceSets)
         }
-        s.safeAs<WithExtraProperties<Documentable>>()?.let { it.extra[InheritorsInfo] }?.let { inheritors ->
-            val map = inheritors.value.filter { it.value.isNotEmpty() }
-            if (map.values.any()) {
-                header(2, "Inheritors") { }
-                +ContentTable(
-                    header = listOf(contentBuilder.contentFor(mainDRI, mainSourcesetData) {
-                        text("Name")
-                    }),
-                    children = map.entries.flatMap { entry -> entry.value.map { Pair(entry.key, it) } }
-                        .groupBy({ it.second }, { it.first }).map { (classlike, platforms) ->
-                            val label = classlike.classNames?.substringAfterLast(".") ?: classlike.toString()
-                                .also { logger.warn("No class name found for DRI $classlike") }
-                            buildGroup(
-                                setOf(classlike),
-                                platforms.toSet(),
-                                ContentKind.Inheritors,
-                                extra = mainExtra + SymbolAnchorHint(label, ContentKind.Inheritors)
-                            ) {
-                                link(label, classlike)
-                            }
-                        },
-                    dci = DCI(setOf(dri), ContentKind.Inheritors),
-                    sourceSets = sourceSets.toDisplaySourceSets(),
-                    style = emptySet(),
-                    extra = mainExtra + SimpleAttr.header("Inheritors")
-                )
-            }
+        if (inheritors.values.any()) {
+            header(2, "Inheritors") { }
+            +ContentTable(
+                header = listOf(contentBuilder.contentFor(mainDRI, mainSourcesetData) {
+                    text("Name")
+                }),
+                children = inheritors.entries.flatMap { entry -> entry.value.map { Pair(entry.key, it) } }
+                    .groupBy({ it.second }, { it.first }).map { (classlike, platforms) ->
+                        val label = classlike.classNames?.substringAfterLast(".") ?: classlike.toString()
+                            .also { logger.warn("No class name found for DRI $classlike") }
+                        buildGroup(
+                            setOf(classlike),
+                            platforms.toSet(),
+                            ContentKind.Inheritors,
+                            extra = mainExtra + SymbolAnchorHint(label, ContentKind.Inheritors)
+                        ) {
+                            link(label, classlike)
+                        }
+                    },
+                dci = DCI(dri, ContentKind.Inheritors),
+                sourceSets = sourceSets.toDisplaySourceSets(),
+                style = emptySet(),
+                extra = mainExtra + SimpleAttr.header("Inheritors")
+            )
         }
     }
 
@@ -236,80 +336,97 @@ open class DefaultPageCreator(
         }
     }
 
-    protected open fun contentForClasslike(c: DClasslike) = contentBuilder.contentFor(c) {
-        @Suppress("UNCHECKED_CAST")
-        val extensions = (c as WithExtraProperties<DClasslike>)
-            .extra[CallableExtensions]?.extensions
-            ?.filterIsInstance<Documentable>().orEmpty()
-        // Extensions are added to sourceSets since they can be placed outside the sourceSets from classlike
-        // Example would be an Interface in common and extension function in jvm
-        group(kind = ContentKind.Cover, sourceSets = mainSourcesetData + extensions.sourceSets) {
-            cover(c.name.orEmpty())
-            sourceSetDependentHint(c.dri, c.sourceSets) {
-                +buildSignature(c)
-                +contentForDescription(c)
+    /**
+     * @param documentables a list of [DClasslike] and [DEnumEntry] with the same dri in different sourceSets
+     */
+    protected open fun contentForClasslikesAndEntries(documentables: List<Documentable>): ContentGroup =
+        contentBuilder.contentFor(documentables.dri, documentables.sourceSets) {
+            val cs = documentables.filterIsInstance<DClasslike>()
+
+            @Suppress("UNCHECKED_CAST")
+            val extensions = (cs as List<WithExtraProperties<DClasslike>>).flatMap {
+                it.extra[CallableExtensions]?.extensions
+                    ?.filterIsInstance<Documentable>().orEmpty()
             }
-        }
 
-        group(styles = setOf(ContentStyle.TabbedContent), sourceSets = mainSourcesetData + extensions.sourceSets) {
-            +contentForComments(c)
-            if (c is WithConstructors) {
-                block(
-                    "Constructors",
-                    2,
-                    ContentKind.Constructors,
-                    c.constructors,
-                    c.sourceSets,
-                    needsAnchors = true,
-                    extra = PropertyContainer.empty<ContentNode>() + SimpleAttr.header("Constructors")
-                ) {
-                    link(it.name, it.dri, kind = ContentKind.Main, styles = setOf(ContentStyle.RowTitle))
-                    sourceSetDependentHint(
-                        it.dri,
-                        it.sourceSets.toSet(),
-                        kind = ContentKind.SourceSetDependentHint,
-                        styles = emptySet(),
-                        extra = PropertyContainer.empty()
-                    ) {
+            // Extensions are added to sourceSets since they can be placed outside the sourceSets from classlike
+            // Example would be an Interface in common and extension function in jvm
+            group(kind = ContentKind.Cover, sourceSets = mainSourcesetData + extensions.sourceSets) {
+                cover(documentables.first().name.orEmpty())
+                sourceSetDependentHint(documentables.dri, documentables.sourceSets) {
+                    documentables.forEach {
                         +buildSignature(it)
-                        contentForBrief(it)
+                        +contentForDescription(it)
                     }
                 }
             }
-            if (c is DEnum) {
-                block(
-                    "Entries",
-                    2,
-                    ContentKind.Classlikes,
-                    c.entries,
-                    c.sourceSets.toSet(),
-                    needsSorting = false,
-                    needsAnchors = true,
-                    extra = mainExtra + SimpleAttr.header("Entries"),
-                    styles = emptySet()
-                ) {
-                    link(it.name, it.dri)
-                    sourceSetDependentHint(
-                        it.dri,
-                        it.sourceSets.toSet(),
-                        kind = ContentKind.SourceSetDependentHint,
-                        extra = PropertyContainer.empty()
+
+            group(styles = setOf(ContentStyle.TabbedContent), sourceSets = mainSourcesetData + extensions.sourceSets) {
+                +contentForComments(documentables)
+                val csWithConstructor = cs.filterIsInstance<WithConstructors>()
+                if (csWithConstructor.isNotEmpty()) {
+                    block(
+                        "Constructors",
+                        2,
+                        ContentKind.Constructors,
+                        csWithConstructor.flatMap { it.constructors }
+                            .filter { it.extra[PrimaryConstructorExtra] == null || it.documentation.isNotEmpty() },
+                        @Suppress("UNCHECKED_CAST")
+                        (csWithConstructor as List<Documentable>).sourceSets,
+                        needsAnchors = true,
+                        extra = PropertyContainer.empty<ContentNode>() + SimpleAttr.header("Constructors")
                     ) {
-                        +buildSignature(it)
-                        contentForBrief(it)
+                        link(it.name, it.dri, kind = ContentKind.Main, styles = setOf(ContentStyle.RowTitle))
+                        sourceSetDependentHint(
+                            it.dri,
+                            it.sourceSets.toSet(),
+                            kind = ContentKind.SourceSetDependentHint,
+                            styles = emptySet(),
+                            extra = PropertyContainer.empty<ContentNode>()
+                        ) {
+                            +buildSignature(it)
+                            contentForBrief(it)
+                        }
                     }
                 }
-            }
-            +contentForScope(c, c.dri, c.sourceSets)
+                val csEnum = cs.filterIsInstance<DEnum>()
+                if (csEnum.isNotEmpty()) {
+                    block(
+                        "Entries",
+                        2,
+                        ContentKind.Classlikes,
+                        csEnum.flatMap { it.entries },
+                        csEnum.sourceSets,
+                        needsSorting = false,
+                        needsAnchors = true,
+                        extra = mainExtra + SimpleAttr.header("Entries"),
+                        styles = emptySet()
+                    ) {
+                        link(it.name, it.dri)
+                        sourceSetDependentHint(
+                            it.dri,
+                            it.sourceSets.toSet(),
+                            kind = ContentKind.SourceSetDependentHint,
+                            extra = PropertyContainer.empty<ContentNode>()
+                        ) {
+                            +buildSignature(it)
+                            contentForBrief(it)
+                        }
+                    }
+                }
+                +contentForScopes(documentables.filterIsInstance<WithScope>(), documentables.sourceSets)
 
-            divergentBlock(
-                "Extensions",
-                extensions,
-                ContentKind.Extensions,
-                extra = mainExtra + SimpleAttr.header("Extensions")
-            )
+                divergentBlock(
+                    "Extensions",
+                    extensions,
+                    ContentKind.Extensions,
+                    extra = mainExtra + SimpleAttr.header("Extensions")
+                )
+            }
         }
-    }
+
+
+    protected open fun contentForClasslike(c: DClasslike) =  contentForClasslikesAndEntries(listOf(c))
 
     @Suppress("UNCHECKED_CAST")
     private inline fun <reified T : TagWrapper> GroupedTags.withTypeUnnamed(): SourceSetDependent<T> =
@@ -379,8 +496,8 @@ open class DefaultPageCreator(
         }.children
     }
 
-    private fun Documentable.getPossibleFallbackSourcesets(sourceSet: DokkaSourceSet) =
-        this.sourceSets.filter { it.sourceSetID in sourceSet.dependentSourceSets }
+    private fun Set<DokkaSourceSet>.getPossibleFallbackSourcesets(sourceSet: DokkaSourceSet) =
+        this.filter { it.sourceSetID in sourceSet.dependentSourceSets }
 
     private fun <V> Map<DokkaSourceSet, V>.fallback(sourceSets: List<DokkaSourceSet>): V? =
         sourceSets.firstOrNull { it in this.keys }.let { this[it] }
@@ -388,8 +505,19 @@ open class DefaultPageCreator(
     protected open fun contentForComments(
         d: Documentable,
         isPlatformHintedContent: Boolean = true
+    ) = contentForComments(d.dri, d.sourceSets, d.groupedTags, isPlatformHintedContent)
+
+    protected open fun contentForComments(
+        d: List<Documentable>,
+        isPlatformHintedContent: Boolean = true
+    ) = contentForComments(d.first().dri, d.sourceSets, d.groupedTags, isPlatformHintedContent)
+
+    protected open fun contentForComments(
+        dri: DRI,
+        sourceSets: Set<DokkaSourceSet>,
+        tags: GroupedTags,
+        isPlatformHintedContent: Boolean = true
     ): List<ContentNode> {
-        val tags = d.groupedTags
 
         fun DocumentableContentBuilder.buildContent(
             platforms: Set<DokkaSourceSet>,
@@ -417,7 +545,7 @@ open class DefaultPageCreator(
                     buildContent(availablePlatforms) {
                         table(kind = ContentKind.Parameters, sourceSets = availablePlatforms) {
                             availablePlatforms.forEach { platform ->
-                                val possibleFallbacks = d.getPossibleFallbackSourcesets(platform)
+                                val possibleFallbacks = sourceSets.getPossibleFallbackSourcesets(platform)
                                 params.mapNotNull { (_, param) ->
                                     (param[platform] ?: param.fallback(possibleFallbacks))?.let {
                                         row(sourceSets = setOf(platform), kind = ContentKind.Parameters) {
@@ -451,7 +579,7 @@ open class DefaultPageCreator(
                     buildContent(availablePlatforms) {
                         table(kind = ContentKind.Sample) {
                             availablePlatforms.forEach { platform ->
-                                val possibleFallbacks = d.getPossibleFallbackSourcesets(platform)
+                                val possibleFallbacks = sourceSets.getPossibleFallbackSourcesets(platform)
                                 seeAlsoTags.forEach { (_, see) ->
                                     (see[platform] ?: see.fallback(possibleFallbacks))?.let {
                                         row(
@@ -537,12 +665,11 @@ open class DefaultPageCreator(
             }
         }
 
-        return contentBuilder.contentFor(d) {
+        return contentBuilder.contentFor(dri, sourceSets) {
             if (tags.isNotEmpty()) {
                 contentForSamples()
                 contentForSeeAlso()
-                if (d !is DProperty)
-                    contentForParams()
+                contentForParams()
                 contentForThrows()
             }
         }.children
@@ -581,22 +708,27 @@ open class DefaultPageCreator(
 
     protected open fun contentForProperty(p: DProperty) = contentForMember(p)
 
-    protected open fun contentForMember(d: Documentable) = contentBuilder.contentFor(d) {
-        group(kind = ContentKind.Cover) {
-            cover(d.name.orEmpty())
-        }
-        divergentGroup(ContentDivergentGroup.GroupID("member")) {
-            instance(setOf(d.dri), d.sourceSets.toSet()) {
-                divergent {
-                    +buildSignature(d)
-                }
-                after {
-                    +contentForDescription(d)
-                    +contentForComments(d, isPlatformHintedContent = false)
+    protected open fun contentForMember(d: Documentable) = contentForMembers(listOf(d))
+
+    protected open fun contentForMembers(doumentables: List<Documentable>) =
+        contentBuilder.contentFor(doumentables.dri, doumentables.sourceSets) {
+            group(kind = ContentKind.Cover) {
+                cover(doumentables.first().name.orEmpty())
+            }
+            divergentGroup(ContentDivergentGroup.GroupID("member")) {
+                doumentables.forEach { d ->
+                    instance(setOf(d.dri), d.sourceSets) {
+                        divergent {
+                            +buildSignature(d)
+                        }
+                        after {
+                            +contentForDescription(d)
+                            +contentForComments(d, isPlatformHintedContent = false)
+                        }
+                    }
                 }
             }
         }
-    }
 
     private fun DocumentableContentBuilder.functionsBlock(name: String, list: Collection<DFunction>) = divergentBlock(
         name,
@@ -610,22 +742,24 @@ open class DefaultPageCreator(
         list: Collection<DProperty>,
         sourceSets: Set<DokkaSourceSet>
     ) {
-        block(
+        multiBlock(
             name,
             2,
             ContentKind.Properties,
-            list,
+            list.groupBy { it.name }.toList(),
             sourceSets,
             needsAnchors = true,
             extra = mainExtra + SimpleAttr.header(name),
             headers = listOf(
                 headers("Name", "Summary")
             )
-        ) {
-            link(it.name, it.dri, kind = ContentKind.Main)
-            sourceSetDependentHint(it.dri, it.sourceSets.toSet(), kind = ContentKind.SourceSetDependentHint) {
-                +buildSignature(it)
-                contentForBrief(it)
+        ) { key, props ->
+            link(key, props.first().dri, kind = ContentKind.Main)
+            sourceSetDependentHint(props.dri, props.sourceSets, kind = ContentKind.SourceSetDependentHint) {
+                props.forEach {
+                    +buildSignature(it)
+                    contentForBrief(it)
+                }
             }
         }
     }
@@ -716,11 +850,19 @@ open class DefaultPageCreator(
     private val List<Documentable>.sourceSets: Set<DokkaSourceSet>
         get() = flatMap { it.sourceSets }.toSet()
 
+    private val List<Documentable>.dri: Set<DRI>
+        get() = map { it.dri }.toSet()
+
     private val Documentable.groupedTags: GroupedTags
         get() = documentation.flatMap { (pd, doc) ->
             doc.children.asSequence().map { pd to it }.toList()
         }.groupBy { it.second::class }
 
+    private val List<Documentable>.groupedTags: GroupedTags
+        get() = this.flatMap { it.documentation.flatMap { (pd, doc) ->
+            doc.children.asSequence().map { pd to it }.toList()
+        } }.groupBy { it.second::class }
+
     private val Documentable.descriptions: SourceSetDependent<Description>
         get() = groupedTags.withTypeUnnamed()
 
@@ -730,6 +872,7 @@ open class DefaultPageCreator(
     private val Documentable.hasSeparatePage: Boolean
         get() = this !is DTypeAlias
 
+    @Suppress("UNCHECKED_CAST")
     private fun <T : Documentable> T.nameAfterClash(): String =
         ((this as? WithExtraProperties<out Documentable>)?.extra?.get(DriClashAwareName)?.value ?: name).orEmpty()
 }
diff --git a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
index 8c3fcd84c5..fe2bc4abf0 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
@@ -227,6 +227,45 @@ open class PageContentBuilder(
             }
         }
 
+        fun multiBlock(
+            name: String,
+            level: Int,
+            kind: Kind = ContentKind.Main,
+            groupedElements: Iterable<Pair<String, List<Documentable>>>,
+            sourceSets: Set<DokkaSourceSet> = mainSourcesetData,
+            styles: Set<Style> = mainStyles,
+            extra: PropertyContainer<ContentNode> = mainExtra,
+            renderWhenEmpty: Boolean = false,
+            needsSorting: Boolean = true,
+            headers: List<ContentGroup> = emptyList(),
+            needsAnchors: Boolean = false,
+            operation: DocumentableContentBuilder.(String, List<Documentable>) -> Unit
+        ) {
+            if (renderWhenEmpty || groupedElements.any()) {
+                header(level, name, kind = kind) { }
+                contents += ContentTable(
+                    header = headers,
+                    children = groupedElements
+                        .let {
+                            if (needsSorting)
+                                it.sortedWith(compareBy(nullsLast(String.CASE_INSENSITIVE_ORDER)) { it.first })
+                            else it
+                        }
+                        .map {
+                            val newExtra = if (needsAnchors) extra + SymbolAnchorHint(it.first, kind) else extra
+                            val documentables = it.second
+                            buildGroup(documentables.map { it.dri }.toSet(), documentables.flatMap { it.sourceSets }.toSet(), kind, styles, newExtra) {
+                                operation(it.first, documentables)
+                            }
+                        },
+                    dci = DCI(mainDRI, kind),
+                    sourceSets = sourceSets.toDisplaySourceSets(),
+                    style = styles,
+                    extra = extra
+                )
+            }
+        }
+
         fun <T> list(
             elements: List<T>,
             prefix: String = "",

From 8632af56f779a4f238fffb5fe508408ec68a20b6 Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Thu, 20 Jan 2022 00:24:39 +0300
Subject: [PATCH 02/17] Merge entries

---
 .../documentables/DefaultPageCreator.kt       | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index 5fe6db7167..a0a8d5f8fe 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -40,7 +40,7 @@ open class DefaultPageCreator(
     protected val separateInheritedMembers =
         configuration?.separateInheritedMembers ?: DokkaBaseConfiguration.separateInheritedMembersDefault
 
-    open fun pageForModule(m: DModule) =
+    open fun pageForModule(m: DModule): ModulePageNode =
         ModulePageNode(m.name.ifEmpty { "<root>" }, contentForModule(m), m, m.packages.map(::pageForPackage))
 
     open fun pageForPackage(p: DPackage): PackagePageNode = PackagePageNode(
@@ -391,26 +391,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)
+                            }
                         }
                     }
                 }

From 622b37d456f850118de82978a09abdf04a73cf88 Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Thu, 20 Jan 2022 00:34:24 +0300
Subject: [PATCH 03/17] Merge constructors

---
 .../documentables/DefaultPageCreator.kt       | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index a0a8d5f8fe..b62e917336 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -365,27 +365,29 @@ open class DefaultPageCreator(
                 +contentForComments(documentables)
                 val csWithConstructor = cs.filterIsInstance<WithConstructors>()
                 if (csWithConstructor.isNotEmpty()) {
-                    block(
+                    val constructorsToDocumented = csWithConstructor.flatMap { it.constructors }
+                    multiBlock(
                         "Constructors",
                         2,
                         ContentKind.Constructors,
-                        csWithConstructor.flatMap { it.constructors }
-                            .filter { it.extra[PrimaryConstructorExtra] == null || it.documentation.isNotEmpty() },
+                        constructorsToDocumented.groupBy { it.parameters.map { it.dri }  }.map { (_,v) -> v.first().name to v },
                         @Suppress("UNCHECKED_CAST")
                         (csWithConstructor as List<Documentable>).sourceSets,
                         needsAnchors = true,
                         extra = PropertyContainer.empty<ContentNode>() + SimpleAttr.header("Constructors")
-                    ) {
-                        link(it.name, it.dri, kind = ContentKind.Main, styles = setOf(ContentStyle.RowTitle))
+                    ) { key, ds ->
+                        link(key, ds.first().dri, kind = ContentKind.Main, styles = setOf(ContentStyle.RowTitle))
                         sourceSetDependentHint(
-                            it.dri,
-                            it.sourceSets.toSet(),
+                            ds.dri,
+                            ds.sourceSets,
                             kind = ContentKind.SourceSetDependentHint,
                             styles = emptySet(),
                             extra = PropertyContainer.empty<ContentNode>()
                         ) {
-                            +buildSignature(it)
-                            contentForBrief(it)
+                            ds.forEach {
+                                +buildSignature(it)
+                                contentForBrief(it)
+                            }
                         }
                     }
                 }

From 809b2fe301644e695f60f8d0c829badb1ca266fd Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Wed, 9 Feb 2022 03:04:23 +0300
Subject: [PATCH 04/17] Ignore DRI extra in `mergeClashingDocumentable`

---
 .../kotlin/translators/documentables/DefaultPageCreator.kt   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index b62e917336..27a47e4f4b 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -133,8 +133,11 @@ open class DefaultPageCreator(
         else -> null
     } as? T?
 
+    /**
+     * Ignore DRI extra because of Enum Entries have [org.jetbrains.dokka.links.EnumEntryDRIExtra]
+     */
     private fun <T : Documentable> List<T>.mergeClashingDocumentable(): List<List<T>> =
-        groupBy { it.dri }.values.toList()
+        groupBy { it.dri.copy(extra = null) }.values.toList()
 
     open fun pageForFunction(f: DFunction) = MemberPageNode(f.nameAfterClash(), contentForFunction(f), setOf(f.dri), f)
 

From 31b103c3a464bdf523015bee93ca66663024e727 Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Sat, 12 Feb 2022 20:08:58 +0300
Subject: [PATCH 05/17] Make documentables in page interface

---
 core/src/main/kotlin/pages/PageNodes.kt       | 29 +++++++----
 core/src/main/kotlin/pages/Pages.kt           |  8 +--
 .../src/main/kotlin/renderers/TestPage.kt     |  8 ++-
 .../renderers/html/htmlPreprocessors.kt       | 19 ++++---
 .../SameMethodNamePageMergerStrategy.kt       |  2 +-
 .../pages/samples/SamplesTransformer.kt       | 14 ++++--
 .../sourcelinks/SourceLinksTransformer.kt     | 50 ++++++++++---------
 .../documentables/DefaultPageCreator.kt       | 18 +++----
 .../content/functions/ContentForBriefTest.kt  | 10 ++--
 .../functions/ContentForConstructors.kt       |  2 +-
 .../DokkaLocationProviderTest.kt              |  5 +-
 .../dokka/javadoc/JavadocPageCreator.kt       |  4 +-
 .../dokka/javadoc/pages/JavadocPageNodes.kt   | 48 +++++++++---------
 .../dokka/javadoc/pages/htmlPreprocessors.kt  |  8 ++-
 .../mathjax/src/main/kotlin/MathjaxPlugin.kt  |  9 ++--
 15 files changed, 120 insertions(+), 114 deletions(-)

diff --git a/core/src/main/kotlin/pages/PageNodes.kt b/core/src/main/kotlin/pages/PageNodes.kt
index 9fc4d6e884..b6a794b1e0 100644
--- a/core/src/main/kotlin/pages/PageNodes.kt
+++ b/core/src/main/kotlin/pages/PageNodes.kt
@@ -18,7 +18,6 @@ interface PageNode : WithChildren<PageNode> {
 interface ContentPage : PageNode {
     val content: ContentNode
     val dri: Set<DRI>
-    val documentable: Documentable?
     val embeddedResources: List<String>
 
     fun modified(
@@ -30,6 +29,16 @@ interface ContentPage : PageNode {
     ): ContentPage
 }
 
+interface WithDocumentables {
+    val documentables: List<Documentable>
+
+    @Deprecated("Deprecated. Remove its usages from your code.",
+        ReplaceWith("documentables.firstOrNull()")
+    )
+    val documentable: Documentable?
+        get() = documentables.firstOrNull()
+}
+
 abstract class RootPageNode(val forceTopLevelName: Boolean = false) : PageNode {
     val parentMap: Map<PageNode, PageNode> by lazy {
         IdentityHashMap<PageNode, PageNode>().apply {
@@ -64,7 +73,7 @@ abstract class RootPageNode(val forceTopLevelName: Boolean = false) : PageNode {
 class ModulePageNode(
     override val name: String,
     override val content: ContentNode,
-    override val documentable: Documentable?,
+    override val documentables: List<Documentable> = listOf(),
     override val children: List<PageNode>,
     override val embeddedResources: List<String> = listOf()
 ) : RootPageNode(), ModulePage {
@@ -81,14 +90,14 @@ class ModulePageNode(
         children: List<PageNode>
     ): ModulePageNode =
         if (name == this.name && content === this.content && embeddedResources === this.embeddedResources && children shallowEq this.children) this
-        else ModulePageNode(name, content, documentable, children, embeddedResources)
+        else ModulePageNode(name, content, documentables, children, embeddedResources)
 }
 
 class PackagePageNode(
     override val name: String,
     override val content: ContentNode,
     override val dri: Set<DRI>,
-    override val documentable: Documentable?,
+    override val documentables: List<Documentable> = listOf(),
     override val children: List<PageNode>,
     override val embeddedResources: List<String> = listOf()
 ) : PackagePage {
@@ -108,14 +117,14 @@ class PackagePageNode(
         children: List<PageNode>
     ): PackagePageNode =
         if (name == this.name && content === this.content && embeddedResources === this.embeddedResources && children shallowEq this.children) this
-        else PackagePageNode(name, content, dri, documentable, children, embeddedResources)
+        else PackagePageNode(name, content, dri, documentables, children, embeddedResources)
 }
 
 class ClasslikePageNode(
     override val name: String,
     override val content: ContentNode,
     override val dri: Set<DRI>,
-    override val documentable: Documentable?,
+    override val documentables: List<Documentable> = listOf(),
     override val children: List<PageNode>,
     override val embeddedResources: List<String> = listOf()
 ) : ClasslikePage {
@@ -130,14 +139,14 @@ class ClasslikePageNode(
         children: List<PageNode>
     ): ClasslikePageNode =
         if (name == this.name && content === this.content && embeddedResources === this.embeddedResources && children shallowEq this.children) this
-        else ClasslikePageNode(name, content, dri, documentable, children, embeddedResources)
+        else ClasslikePageNode(name, content, dri, documentables, children, embeddedResources)
 }
 
 class MemberPageNode(
     override val name: String,
     override val content: ContentNode,
     override val dri: Set<DRI>,
-    override val documentable: Documentable?,
+    override val documentables: List<Documentable> = listOf(),
     override val children: List<PageNode> = emptyList(),
     override val embeddedResources: List<String> = listOf()
 ) : MemberPage {
@@ -152,7 +161,7 @@ class MemberPageNode(
         children: List<PageNode>
     ): MemberPageNode =
         if (name == this.name && content === this.content && embeddedResources === this.embeddedResources && children shallowEq this.children) this
-        else MemberPageNode(name, content, dri, documentable, children, embeddedResources)
+        else MemberPageNode(name, content, dri, documentables, children, embeddedResources)
 }
 
 
@@ -165,8 +174,6 @@ class MultimoduleRootPageNode(
 
     override val children: List<PageNode> = emptyList()
 
-    override val documentable: Documentable? = null
-
     override fun modified(name: String, children: List<PageNode>): RootPageNode =
         MultimoduleRootPageNode(dri, content, embeddedResources)
 
diff --git a/core/src/main/kotlin/pages/Pages.kt b/core/src/main/kotlin/pages/Pages.kt
index b65e72d611..90ae09e8ce 100644
--- a/core/src/main/kotlin/pages/Pages.kt
+++ b/core/src/main/kotlin/pages/Pages.kt
@@ -2,10 +2,10 @@ package org.jetbrains.dokka.pages
 
 interface MultimoduleRootPage : ContentPage
 
-interface ModulePage : ContentPage
+interface ModulePage : ContentPage, WithDocumentables
 
-interface PackagePage : ContentPage
+interface PackagePage : ContentPage, WithDocumentables
 
-interface ClasslikePage : ContentPage
+interface ClasslikePage : ContentPage, WithDocumentables
 
-interface MemberPage : ContentPage
\ No newline at end of file
+interface MemberPage : ContentPage, WithDocumentables
\ No newline at end of file
diff --git a/plugins/base/base-test-utils/src/main/kotlin/renderers/TestPage.kt b/plugins/base/base-test-utils/src/main/kotlin/renderers/TestPage.kt
index 67ba2dd3d2..4066c7c662 100644
--- a/plugins/base/base-test-utils/src/main/kotlin/renderers/TestPage.kt
+++ b/plugins/base/base-test-utils/src/main/kotlin/renderers/TestPage.kt
@@ -1,15 +1,14 @@
 package renderers
 
 import org.jetbrains.dokka.DokkaConfiguration
+import org.jetbrains.dokka.base.signatures.KotlinSignatureProvider
+import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
+import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
 import org.jetbrains.dokka.links.DRI
-import org.jetbrains.dokka.model.Documentable
 import org.jetbrains.dokka.model.doc.DocTag
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.utilities.DokkaConsoleLogger
-import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
-import org.jetbrains.dokka.base.signatures.KotlinSignatureProvider
-import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
 
 fun testPage(callback: PageContentBuilder.DocumentableContentBuilder.() -> Unit): RawTestPage {
     val content = PageContentBuilder(
@@ -29,7 +28,6 @@ class RawTestPage(
     override val content: ContentNode,
     override val name: String = "testPage",
     override val dri: Set<DRI> = setOf(DRI.topLevel),
-    override val documentable: Documentable? = null,
     override val embeddedResources: List<String> = emptyList(),
     override val children: List<PageNode> = emptyList(),
 ): RootPageNode(), ContentPage {
diff --git a/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt b/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt
index 43526dc352..3297d09f12 100644
--- a/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt
+++ b/plugins/base/src/main/kotlin/renderers/html/htmlPreprocessors.kt
@@ -1,14 +1,14 @@
 package org.jetbrains.dokka.base.renderers.html
 
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.DokkaBaseConfiguration
 import org.jetbrains.dokka.base.renderers.sourceSets
-import org.jetbrains.dokka.base.templating.AddToSearch
 import org.jetbrains.dokka.base.templating.AddToSourcesetDependencies
 import org.jetbrains.dokka.base.templating.toJsonString
-import org.jetbrains.dokka.links.DRI
-import org.jetbrains.dokka.model.*
+import org.jetbrains.dokka.model.DEnum
+import org.jetbrains.dokka.model.DEnumEntry
+import org.jetbrains.dokka.model.DFunction
+import org.jetbrains.dokka.model.withDescendants
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.plugability.configuration
@@ -30,19 +30,18 @@ abstract class NavigationDataProvider {
         when {
             this !is ClasslikePageNode ->
                 children.filterIsInstance<ContentPage>().map { visit(it) }
-            documentable is DEnum ->
-                children.filter { it is ContentPage && it.documentable is DEnumEntry }.map { visit(it as ContentPage) }
+            documentables.any { it is DEnum } ->
+                children.filter { it is WithDocumentables && it.documentables.any { it is DEnumEntry } }
+                    .map { visit(it as ContentPage) }
             else -> emptyList()
         }.sortedBy { it.name.toLowerCase() }
 
     /**
-     * Parenthesis is applied in 2 cases:
+     * Parenthesis is applied in 1 case:
      *  - page only contains functions (therefore documentable from this page is [DFunction])
-     *  - page merges only functions (documentable is null because [SameMethodNamePageMergerStrategy][org.jetbrains.dokka.base.transformers.pages.merger.SameMethodNamePageMergerStrategy]
-     *      removes it from page)
      */
     private val ContentPage.displayableName: String
-        get() = if (documentable is DFunction || (documentable == null && dri.all { it.callable != null })) {
+        get() = if (this is WithDocumentables && documentables.all { it is DFunction }) {
             "$name()"
         } else {
             name
diff --git a/plugins/base/src/main/kotlin/transformers/pages/merger/SameMethodNamePageMergerStrategy.kt b/plugins/base/src/main/kotlin/transformers/pages/merger/SameMethodNamePageMergerStrategy.kt
index 3b83050388..6c12c71954 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/merger/SameMethodNamePageMergerStrategy.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/merger/SameMethodNamePageMergerStrategy.kt
@@ -23,7 +23,7 @@ class SameMethodNamePageMergerStrategy(val logger: DokkaLogger) : PageMergerStra
             children = members.flatMap { it.children }.distinct(),
             content = squashDivergentInstances(members).withSourceSets(members.allSourceSets()),
             embeddedResources = members.flatMap { it.embeddedResources }.distinct(),
-            documentable = null
+            documentables = members.flatMap { it.documentables }
         )
 
         return (pages - members) + listOf(merged)
diff --git a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
index 3ff7a77d26..627fea2020 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
@@ -35,14 +35,18 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer {
             "<script src=\"https://unpkg.com/kotlin-playground@1\"></script>"
 
         return input.transformContentPagesTree { page ->
-            page.documentable?.documentation?.entries?.fold(page) { acc, entry ->
-                entry.value.children.filterIsInstance<Sample>().fold(acc) { acc, sample ->
+            val samples = (page as? WithDocumentables)?.documentables?.flatMap {
+                it.documentation.entries.flatMap { entry ->
+                    entry.value.children.filterIsInstance<Sample>().map { entry.key to it }
+                }
+            }
+
+            samples?.fold(page as ContentPage) { acc, sample ->
                     acc.modified(
-                        content = acc.content.addSample(page, entry.key, sample.name, analysis),
+                        content = acc.content.addSample(page, sample.first, sample.second.name, analysis),
                         embeddedResources = acc.embeddedResources + kotlinPlaygroundScript
                     )
-                }
-            } ?: page
+                } ?: page
         }
     }
 
diff --git a/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt
index f66ff2229c..f5c58704f2 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt
@@ -1,15 +1,15 @@
 package org.jetbrains.dokka.base.transformers.pages.sourcelinks
 
-import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiDocumentManager
+import com.intellij.psi.PsiElement
 import org.jetbrains.dokka.DokkaConfiguration
-import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
-import org.jetbrains.dokka.model.DocumentableSource
 import org.jetbrains.dokka.DokkaConfiguration.DokkaSourceSet
 import org.jetbrains.dokka.analysis.DescriptorDocumentableSource
 import org.jetbrains.dokka.analysis.PsiDocumentableSource
 import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.resolvers.anchors.SymbolAnchorHint
+import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder
+import org.jetbrains.dokka.model.DocumentableSource
 import org.jetbrains.dokka.model.WithSources
 import org.jetbrains.dokka.model.toDisplaySourceSets
 import org.jetbrains.dokka.pages.*
@@ -32,10 +32,11 @@ class SourceLinksTransformer(val context: DokkaContext) : PageTransformer {
 
     override fun invoke(input: RootPageNode) =
         input.transformContentPagesTree { node ->
-            when (val documentable = node.documentable) {
-                is WithSources -> resolveSources(documentable)
+            when (node) {
+                is WithDocumentables ->
+                    node.documentables.filterIsInstance<WithSources>().flatMap { resolveSources(it) }
                     .takeIf { it.isNotEmpty() }
-                    ?.let { node.addSourcesContent(it) }
+                    ?.let { (node as ContentPage).addSourcesContent(it) }
                     ?: node
                 else -> node
             }
@@ -65,23 +66,26 @@ class SourceLinksTransformer(val context: DokkaContext) : PageTransformer {
     private fun PageContentBuilder.buildSourcesContent(
         node: ContentPage,
         sources: List<Pair<DokkaSourceSet, String>>
-    ) = contentFor(
-        node.dri.first(),
-        node.documentable!!.sourceSets.toSet()
-    ) {
-        header(2, "Sources", kind = ContentKind.Source)
-        +ContentTable(
-            header = emptyList(),
-            children = sources.map {
-                buildGroup(node.dri, setOf(it.first), kind = ContentKind.Source, extra = mainExtra + SymbolAnchorHint(it.second, ContentKind.Source)) {
-                    link("${it.first.displayName} source", it.second)
-                }
-            },
-            dci = DCI(node.dri, ContentKind.Source),
-            sourceSets = node.documentable!!.sourceSets.toDisplaySourceSets(),
-            style = emptySet(),
-            extra = mainExtra + SimpleAttr.header("Sources")
-        )
+    ): ContentGroup {
+        val documentables = (node as? WithDocumentables)?.documentables.orEmpty()
+        return contentFor(
+            node.dri,
+            documentables.flatMap { it.sourceSets }.toSet()
+        ) {
+            header(2, "Sources", kind = ContentKind.Source)
+            +ContentTable(
+                header = emptyList(),
+                children = sources.map {
+                    buildGroup(node.dri, setOf(it.first), kind = ContentKind.Source, extra = mainExtra + SymbolAnchorHint(it.second, ContentKind.Source)) {
+                        link("${it.first.displayName} source", it.second)
+                    }
+                },
+                dci = DCI(node.dri, ContentKind.Source),
+                sourceSets = documentables.flatMap { it.sourceSets }.toDisplaySourceSets(),
+                style = emptySet(),
+                extra = mainExtra + SimpleAttr.header("Sources")
+            )
+        }
     }
 
     private fun DocumentableSource.toLink(sourceLink: SourceLink): String {
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index 27a47e4f4b..ef3c007a4c 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -41,10 +41,10 @@ open class DefaultPageCreator(
         configuration?.separateInheritedMembers ?: DokkaBaseConfiguration.separateInheritedMembersDefault
 
     open fun pageForModule(m: DModule): ModulePageNode =
-        ModulePageNode(m.name.ifEmpty { "<root>" }, contentForModule(m), m, m.packages.map(::pageForPackage))
+        ModulePageNode(m.name.ifEmpty { "<root>" }, contentForModule(m), listOf(m), m.packages.map(::pageForPackage))
 
     open fun pageForPackage(p: DPackage): PackagePageNode = PackagePageNode(
-        p.name, contentForPackage(p), setOf(p.dri), p,
+        p.name, contentForPackage(p), setOf(p.dri), listOf(p),
         if (mergeNoExpectActualDeclarations)
             p.classlikes.mergeClashingDocumentable().map(::pageForClasslikesAndEntries) +
                     p.functions.mergeClashingDocumentable().map(::pageForFunctions) +
@@ -56,7 +56,7 @@ open class DefaultPageCreator(
 
     open fun pageForEnumEntry(e: DEnumEntry): ClasslikePageNode =
         ClasslikePageNode(
-            e.nameAfterClash(), contentForEnumEntry(e), setOf(e.dri), e,
+            e.nameAfterClash(), contentForEnumEntry(e), setOf(e.dri), listOf(e),
             e.classlikes.renameClashingDocumentable().map(::pageForClasslike) +
                     e.filteredFunctions.renameClashingDocumentable().map(::pageForFunction) +
                     e.filteredProperties.renameClashingDocumentable().mapNotNull(::pageForProperty)
@@ -66,7 +66,7 @@ open class DefaultPageCreator(
         val constructors = if (c is WithConstructors) c.constructors else emptyList()
 
         return ClasslikePageNode(
-            c.nameAfterClash(), contentForClasslike(c), setOf(c.dri), c,
+            c.nameAfterClash(), contentForClasslike(c), setOf(c.dri), listOf(c),
             constructors.map(::pageForFunction) +
                     c.classlikes.renameClashingDocumentable().map(::pageForClasslike) +
                     c.filteredFunctions.renameClashingDocumentable().map(::pageForFunction) +
@@ -105,7 +105,7 @@ open class DefaultPageCreator(
 
 
         return ClasslikePageNode(
-            documentables.first().nameAfterClash(), contentForClasslikesAndEntries(documentables), dri, documentables.singleOrNull(),
+            documentables.first().nameAfterClash(), contentForClasslikesAndEntries(documentables), dri, documentables,
             childrenPages
         )
     }
@@ -139,23 +139,23 @@ open class DefaultPageCreator(
     private fun <T : Documentable> List<T>.mergeClashingDocumentable(): List<List<T>> =
         groupBy { it.dri.copy(extra = null) }.values.toList()
 
-    open fun pageForFunction(f: DFunction) = MemberPageNode(f.nameAfterClash(), contentForFunction(f), setOf(f.dri), f)
+    open fun pageForFunction(f: DFunction) = MemberPageNode(f.nameAfterClash(), contentForFunction(f), setOf(f.dri), listOf(f))
 
     open fun pageForFunctions(fs: List<DFunction>): MemberPageNode {
         val dri = fs.dri.also { if (it.size != 1) {
             logger.error("Function dri should have the same one ${it.first()} inside the one page!")
         } }
-        return MemberPageNode(fs.first().nameAfterClash(), contentForMembers(fs), dri, fs.singleOrNull())
+        return MemberPageNode(fs.first().nameAfterClash(), contentForMembers(fs), dri, fs)
     }
 
     open fun pageForProperty(p: DProperty): MemberPageNode? =
-        MemberPageNode(p.nameAfterClash(), contentForProperty(p), setOf(p.dri), p)
+        MemberPageNode(p.nameAfterClash(), contentForProperty(p), setOf(p.dri), listOf(p))
 
     open fun pageForProperties(ps: List<DProperty>): MemberPageNode {
         val dri = ps.dri.also { if (it.size != 1) {
             logger.error("Property dri should have the same one ${it.first()} inside the one page!")
         } }
-       return MemberPageNode(ps.first().nameAfterClash(), contentForMembers(ps), dri, ps.singleOrNull())
+       return MemberPageNode(ps.first().nameAfterClash(), contentForMembers(ps), dri, ps)
     }
 
     private fun <T> T.isInherited(): Boolean where T : Documentable, T : WithExtraProperties<T> =
diff --git a/plugins/base/src/test/kotlin/content/functions/ContentForBriefTest.kt b/plugins/base/src/test/kotlin/content/functions/ContentForBriefTest.kt
index 7d8a169b06..50f9e3576a 100644
--- a/plugins/base/src/test/kotlin/content/functions/ContentForBriefTest.kt
+++ b/plugins/base/src/test/kotlin/content/functions/ContentForBriefTest.kt
@@ -1,11 +1,11 @@
 package content.functions
 
-import org.junit.Assert.assertEquals
 import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest
 import org.jetbrains.dokka.links.TypeConstructor
 import org.jetbrains.dokka.model.DClass
 import org.jetbrains.dokka.model.dfs
 import org.jetbrains.dokka.pages.*
+import org.junit.Assert.assertEquals
 import org.junit.jupiter.api.Test
 import kotlin.test.assertNull
 
@@ -60,7 +60,7 @@ class ContentForBriefTest : BaseAbstractTest() {
         testInline(codeWithSecondaryAndPrimaryConstructorsDocumented, testConfiguration) {
             pagesTransformationStage = { module ->
                 val classPage =
-                    module.dfs { it.name == "Example" && (it as ContentPage).documentable is DClass } as ContentPage
+                    module.dfs { it.name == "Example" && (it as WithDocumentables).documentables.firstOrNull() is DClass } as ContentPage
                 val constructorsTable =
                     classPage.content.dfs { it is ContentTable && it.dci.kind == ContentKind.Constructors } as ContentTable
 
@@ -84,7 +84,7 @@ class ContentForBriefTest : BaseAbstractTest() {
         testInline(codeWithSecondaryAndPrimaryConstructorsDocumented, testConfiguration) {
             pagesTransformationStage = { module ->
                 val classPage =
-                    module.dfs { it.name == "Example" && (it as ContentPage).documentable is DClass } as ContentPage
+                    module.dfs { it.name == "Example" && (it as WithDocumentables).documentables.firstOrNull() is DClass } as ContentPage
                 val constructorsTable =
                     classPage.content.dfs { it is ContentTable && it.dci.kind == ContentKind.Constructors } as ContentTable
 
@@ -108,7 +108,7 @@ class ContentForBriefTest : BaseAbstractTest() {
         testInline(codeWithDocumentedParameter, testConfiguration) {
             pagesTransformationStage = { module ->
                 val classPage =
-                    module.dfs { it.name == "Example" && (it as ContentPage).documentable is DClass } as ContentPage
+                    module.dfs { it.name == "Example" && (it as WithDocumentables).documentables.firstOrNull() is DClass } as ContentPage
                 val constructorsTable =
                     classPage.content.dfs { it is ContentTable && it.dci.kind == ContentKind.Constructors } as ContentTable
 
@@ -319,7 +319,7 @@ class ContentForBriefTest : BaseAbstractTest() {
     }
 
     private fun RootPageNode.singleFunctionDescription(className: String): ContentGroup {
-        val classPage = dfs { it.name == className && (it as ContentPage).documentable is DClass } as ContentPage
+        val classPage = dfs { it.name == className && (it as WithDocumentables).documentables.firstOrNull() is DClass } as ContentPage
         val functionsTable =
             classPage.content.dfs { it is ContentTable && it.dci.kind == ContentKind.Functions } as ContentTable
 
diff --git a/plugins/base/src/test/kotlin/content/functions/ContentForConstructors.kt b/plugins/base/src/test/kotlin/content/functions/ContentForConstructors.kt
index 832fa6f67e..8da3be54d8 100644
--- a/plugins/base/src/test/kotlin/content/functions/ContentForConstructors.kt
+++ b/plugins/base/src/test/kotlin/content/functions/ContentForConstructors.kt
@@ -32,7 +32,7 @@ class ContentForConstructors : BaseAbstractTest() {
         """.trimIndent(), testConfiguration) {
             pagesTransformationStage = { module ->
                 val classPage =
-                    module.dfs { it.name == "Example" && (it as ContentPage).documentable is DClass } as ContentPage
+                    module.dfs { it.name == "Example" && (it as WithDocumentables).documentables.firstOrNull() is DClass } as ContentPage
                 val constructorsTable =
                     classPage.content.dfs { it is ContentTable && it.dci.kind == ContentKind.Constructors } as ContentTable
 
diff --git a/plugins/base/src/test/kotlin/locationProvider/DokkaLocationProviderTest.kt b/plugins/base/src/test/kotlin/locationProvider/DokkaLocationProviderTest.kt
index 8c96eab3c4..59406e1e60 100644
--- a/plugins/base/src/test/kotlin/locationProvider/DokkaLocationProviderTest.kt
+++ b/plugins/base/src/test/kotlin/locationProvider/DokkaLocationProviderTest.kt
@@ -53,8 +53,7 @@ class DokkaLocationProviderTest : BaseAbstractTest() {
                     ModulePageNode(
                         name = name,
                         children = packages.pages,
-                        content = stubContentNode,
-                        documentable = null
+                        content = stubContentNode
                     )
                 )
             }
@@ -69,7 +68,6 @@ class DokkaLocationProviderTest : BaseAbstractTest() {
                         name = name,
                         children = packages.pages,
                         content = stubContentNode,
-                        documentable = null,
                         dri = emptySet()
                     )
                 )
@@ -84,7 +82,6 @@ class DokkaLocationProviderTest : BaseAbstractTest() {
                         name = name,
                         children = emptyList(),
                         content = stubContentNode,
-                        documentable = null,
                         dri = emptySet()
                     )
                 )
diff --git a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/JavadocPageCreator.kt b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/JavadocPageCreator.kt
index 96bcec7092..61d45ae10d 100644
--- a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/JavadocPageCreator.kt
+++ b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/JavadocPageCreator.kt
@@ -33,7 +33,7 @@ open class JavadocPageCreator(context: DokkaContext) {
         )
 
     fun pageForPackage(p: DPackage) =
-        JavadocPackagePageNode(p.name, contentForPackage(p), setOf(p.dri), p,
+        JavadocPackagePageNode(p.name, contentForPackage(p), setOf(p.dri), listOf(p),
             p.classlikes.mapNotNull { pageForClasslike(it) }
         )
 
@@ -68,7 +68,7 @@ open class JavadocPageCreator(context: DokkaContext) {
                         PropertyContainer.withAll(it.indexesInDocumentation())
                     )
                 },
-                documentable = c,
+                documentables = listOf(c),
                 children = children,
                 extra = ((c as? WithExtraProperties<Documentable>)?.extra
                     ?: PropertyContainer.empty()) + c.indexesInDocumentation()
diff --git a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/JavadocPageNodes.kt b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/JavadocPageNodes.kt
index 572c5dec5b..df93e58ce6 100644
--- a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/JavadocPageNodes.kt
+++ b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/JavadocPageNodes.kt
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.resolve.DescriptorUtils.getClassDescriptorForType
 
-interface JavadocPageNode : ContentPage
+interface JavadocPageNode : ContentPage, WithDocumentables
 
 interface WithJavadocExtra<T : Documentable> : WithExtraProperties<T> {
     override fun withNewExtras(newExtras: PropertyContainer<T>): T =
@@ -43,7 +43,7 @@ class JavadocModulePageNode(
     JavadocPageNode,
     ModulePage {
 
-    override val documentable: Documentable? = null
+    override val documentables:List<Documentable> = emptyList()
     override val embeddedResources: List<String> = emptyList()
     override fun modified(name: String, children: List<PageNode>): RootPageNode =
         JavadocModulePageNode(name, content, children, dri, extra)
@@ -66,7 +66,7 @@ class JavadocPackagePageNode(
     override val content: JavadocContentNode,
     override val dri: Set<DRI>,
 
-    override val documentable: Documentable? = null,
+    override val documentables:List<Documentable> = emptyList(),
     override val children: List<PageNode> = emptyList(),
     override val embeddedResources: List<String> = listOf()
 ) : JavadocPageNode,
@@ -91,7 +91,7 @@ class JavadocPackagePageNode(
         name,
         content,
         dri,
-        documentable,
+        documentables,
         children,
         embeddedResources
     )
@@ -107,7 +107,7 @@ class JavadocPackagePageNode(
             name,
             content as JavadocContentNode,
             dri,
-            documentable,
+            documentables,
             children,
             embeddedResources
         )
@@ -182,7 +182,7 @@ class JavadocClasslikePageNode(
     val classlikes: List<JavadocClasslikePageNode>,
     val properties: List<JavadocPropertyNode>,
     override val brief: List<ContentNode>,
-    override val documentable: Documentable? = null,
+    override val documentables:List<Documentable> = emptyList(),
     override val children: List<PageNode> = emptyList(),
     override val embeddedResources: List<String> = listOf(),
     override val extra: PropertyContainer<DClasslike> = PropertyContainer.empty(),
@@ -194,7 +194,7 @@ class JavadocClasslikePageNode(
     fun getAnchorables(): List<AnchorableJavadocNode> =
         constructors + methods + entries + properties
 
-    val kind: String? = documentable?.kind()
+    val kind: String? = documentables.firstOrNull()?.kind()
     val packageName = dri.first().packageName
 
     override fun getId(): String = name
@@ -215,7 +215,7 @@ class JavadocClasslikePageNode(
         classlikes,
         properties,
         brief,
-        documentable,
+        documentables,
         children,
         embeddedResources,
         extra
@@ -240,7 +240,7 @@ class JavadocClasslikePageNode(
             classlikes,
             properties,
             brief,
-            documentable,
+            documentables,
             children,
             embeddedResources,
             extra
@@ -254,7 +254,7 @@ class AllClassesPage(val classes: List<JavadocClasslikePageNode>) : JavadocPageN
     override val name: String = "All Classes"
     override val dri: Set<DRI> = setOf(DRI.topLevel)
 
-    override val documentable: Documentable? = null
+    override val documentables:List<Documentable> = emptyList()
     override val embeddedResources: List<String> = emptyList()
 
     override val content: ContentNode =
@@ -285,7 +285,7 @@ class DeprecatedPage(
 ) : JavadocPageNode {
     override val name: String = "deprecated"
     override val dri: Set<DRI> = setOf(DRI.topLevel)
-    override val documentable: Documentable? = null
+    override val documentables:List<Documentable> = emptyList()
     override val children: List<PageNode> = emptyList()
     override val embeddedResources: List<String> = listOf()
 
@@ -339,7 +339,7 @@ class IndexPage(
 ) : JavadocPageNode {
     override val name: String = "index-$id"
     override val dri: Set<DRI> = setOf(DRI.topLevel)
-    override val documentable: Documentable? = null
+    override val documentables:List<Documentable> = emptyList()
     override val children: List<PageNode> = emptyList()
     override val embeddedResources: List<String> = listOf()
     val title: String = "${keys[id - 1]}-index"
@@ -370,7 +370,7 @@ class TreeViewPage(
     val packages: List<JavadocPackagePageNode>?,
     val classes: List<JavadocClasslikePageNode>?,
     override val dri: Set<DRI>,
-    override val documentable: Documentable?,
+    override val documentables:List<Documentable> = emptyList(),
     val root: PageNode
 ) : JavadocPageNode {
     init {
@@ -378,7 +378,7 @@ class TreeViewPage(
         assert(packages != null || classes != null)
     }
 
-    private val documentables = root.children.filterIsInstance<ContentPage>().flatMap { node ->
+    private val childrenDocumentables = root.children.filterIsInstance<WithDocumentables>().flatMap { node ->
         getDocumentableEntries(node)
     }.groupBy({ it.first }) { it.second }.map { (l, r) -> l to r.first() }.toMap()
 
@@ -389,12 +389,12 @@ class TreeViewPage(
 
     override val children: List<PageNode> = emptyList()
 
-    val title = when (documentable) {
+    val title = when (documentables.firstOrNull()) {
         is DPackage -> "$name Class Hierarchy"
         else -> "All packages"
     }
 
-    val kind = when (documentable) {
+    val kind = when (documentables.firstOrNull()) {
         is DPackage -> "package"
         else -> "main"
     }
@@ -411,7 +411,7 @@ class TreeViewPage(
             packages = children.filterIsInstance<JavadocPackagePageNode>().takeIf { it.isNotEmpty() },
             classes = children.filterIsInstance<JavadocClasslikePageNode>().takeIf { it.isNotEmpty() },
             dri = dri,
-            documentable = documentable,
+            documentables,
             root = root
         )
 
@@ -421,7 +421,7 @@ class TreeViewPage(
             packages = children.filterIsInstance<JavadocPackagePageNode>().takeIf { it.isNotEmpty() },
             classes = children.filterIsInstance<JavadocClasslikePageNode>().takeIf { it.isNotEmpty() },
             dri = dri,
-            documentable = documentable,
+            documentables,
             root = root
         )
 
@@ -473,7 +473,7 @@ class TreeViewPage(
             listOf(psi to l) + l.flatMap { gatherPsiClasses(it) }
         }
 
-        val psiInheritanceTree = documentables.flatMap { (_, v) -> (v as? WithSources)?.sources?.values.orEmpty() }
+        val psiInheritanceTree = childrenDocumentables.flatMap { (_, v) -> (v as? WithSources)?.sources?.values.orEmpty() }
             .filterIsInstance<PsiDocumentableSource>().mapNotNull { it.psi as? PsiClass }.flatMap(::gatherPsiClasses)
             .flatMap { entry -> entry.second.map { it to entry.first } }
             .let {
@@ -523,16 +523,16 @@ class TreeViewPage(
     }
 
     private fun generateInterfaceGraph() {
-        documentables.values.filterIsInstance<DInterface>()
+        childrenDocumentables.values.filterIsInstance<DInterface>()
     }
 
-    private fun getDocumentableEntries(node: ContentPage): List<Pair<DRI, Documentable>> =
-        listOfNotNull(node.documentable?.let { it.dri to it }) +
-                node.children.filterIsInstance<ContentPage>().flatMap(::getDocumentableEntries)
+    private fun getDocumentableEntries(node: WithDocumentables): List<Pair<DRI, Documentable>> =
+        node.documentables.map { it.dri to it } +
+                (node as? ContentPage)?.children?.filterIsInstance<WithDocumentables>()?.flatMap(::getDocumentableEntries).orEmpty()
 
     private fun getDescriptorMap(): Map<DRI, ClassDescriptor> {
         val map: MutableMap<DRI, ClassDescriptor> = mutableMapOf()
-        documentables
+        childrenDocumentables
             .mapNotNull { (k, v) ->
                 v.descriptorForPlatform()?.let { k to it }?.also { (k, v) -> map[k] = v }
             }.map { it.second }.forEach { gatherSupertypes(it, map) }
diff --git a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/htmlPreprocessors.kt b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/htmlPreprocessors.kt
index c04c753867..bef4108c09 100644
--- a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/htmlPreprocessors.kt
+++ b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/htmlPreprocessors.kt
@@ -4,12 +4,10 @@ import org.jetbrains.dokka.base.renderers.sourceSets
 import org.jetbrains.dokka.base.transformers.documentables.deprecatedAnnotation
 import org.jetbrains.dokka.base.transformers.documentables.isDeprecated
 import org.jetbrains.dokka.base.transformers.documentables.isException
-import org.jetbrains.dokka.model.Documentable
 import org.jetbrains.dokka.model.BooleanValue
-import org.jetbrains.dokka.model.WithSupertypes
+import org.jetbrains.dokka.model.Documentable
 import org.jetbrains.dokka.pages.*
 import org.jetbrains.dokka.transformers.pages.PageTransformer
-import kotlin.collections.HashMap
 
 object ResourcesInstaller : PageTransformer {
     override fun invoke(input: RootPageNode): RootPageNode = input.modified(
@@ -37,7 +35,7 @@ object TreeViewInstaller : PageTransformer {
             packages = node.children<JavadocPackagePageNode>().map { installPackageTreeNode(it, root) },
             classes = null,
             dri = node.dri,
-            documentable = node.documentable,
+            documentables = node.documentables,
             root = root
         )
 
@@ -55,7 +53,7 @@ object TreeViewInstaller : PageTransformer {
             packages = null,
             classes = node.children.filterIsInstance<JavadocClasslikePageNode>(),
             dri = node.dri,
-            documentable = node.documentable,
+            documentables = node.documentables,
             root = root
         )
 
diff --git a/plugins/mathjax/src/main/kotlin/MathjaxPlugin.kt b/plugins/mathjax/src/main/kotlin/MathjaxPlugin.kt
index 89c13202a8..669238ffe3 100644
--- a/plugins/mathjax/src/main/kotlin/MathjaxPlugin.kt
+++ b/plugins/mathjax/src/main/kotlin/MathjaxPlugin.kt
@@ -9,6 +9,7 @@ import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder.Doc
 import org.jetbrains.dokka.model.doc.CustomTagWrapper
 import org.jetbrains.dokka.pages.ContentPage
 import org.jetbrains.dokka.pages.RootPageNode
+import org.jetbrains.dokka.pages.WithDocumentables
 import org.jetbrains.dokka.plugability.DokkaPlugin
 import org.jetbrains.dokka.transformers.pages.PageTransformer
 
@@ -35,12 +36,10 @@ object MathjaxTransformer : PageTransformer {
     }
 
     private val ContentPage.isNeedingMathjax
-        get() = documentable?.documentation?.values
-            ?.flatMap { it.children }
-            .orEmpty()
-            .any { (it as? CustomTagWrapper)?.name == ANNOTATION }
+        get() = (this as WithDocumentables).documentables.any { it.documentation.values
+            .flatMap { it.children }
+            .any { (it as? CustomTagWrapper)?.name == ANNOTATION } }
 }
-
 object MathjaxTagContentProvider : CustomTagContentProvider {
 
     override fun isApplicable(customTag: CustomTagWrapper) = customTag.name == ANNOTATION

From 2a57bb0c4da1132884843d0ab25248d70d7755df Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Sat, 12 Feb 2022 21:31:58 +0300
Subject: [PATCH 06/17] Fix StdLib integration test

---
 .../gradle/projects/stdlib/stdlib.diff         | 18 +++++++++++++++++-
 .../kotlin/StdlibGradleIntegrationTest.kt      |  4 ++--
 .../dokka/it/AbstractIntegrationTest.kt        |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/integration-tests/gradle/projects/stdlib/stdlib.diff b/integration-tests/gradle/projects/stdlib/stdlib.diff
index 71d27c9925..a63bbedeec 100644
--- a/integration-tests/gradle/projects/stdlib/stdlib.diff
+++ b/integration-tests/gradle/projects/stdlib/stdlib.diff
@@ -37,7 +37,7 @@ diff --git a/build.gradle b/build.gradle
 index aa8f21b..dd6a2ae 100644
 --- a/build.gradle
 +++ b/build.gradle
-@@ -1,80 +1,428 @@
+@@ -1,80 +1,444 @@
 +import org.jetbrains.dokka.Platform
 +
  plugins {
@@ -163,6 +163,7 @@ index aa8f21b..dd6a2ae 100644
 +    task dokkaStdlib(type: org.jetbrains.dokka.gradle.DokkaTask) {
 +        outputDirectory.set(new File(outputDir, "/kotlin-stdlib"))
 +        moduleName.set("kotlin-stdlib")
++        pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase": """{ "mergeNoExpectActualDeclarations": "true" }"""])
 +        dokkaSourceSets {
 +            register("kotlin-stdlib-common") {
 +                skipDeprecated.set(false)
@@ -179,6 +180,16 @@ index aa8f21b..dd6a2ae 100644
 +                sourceRoots.from("$kotlin_root/core/builtins/native")
 +                sourceRoots.from("$kotlin_root/core/builtins/src")
 +                sourceRoots.from("$kotlin_sources/kotlin-stdlib-common")
++                sourceLink {
++                    localDirectory.set(file("$kotlin_sources/kotlin-stdlib-common"))
++                    remoteUrl.set(new URL("https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib/common/src"))
++                    remoteLineSuffix.set("#L")
++                }
++                sourceLink {
++                    localDirectory.set(file("$kotlin_root/core/builtins/src"))
++                    remoteUrl.set(new URL("https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib/src"))
++                    remoteLineSuffix.set("#L")
++                }
 +            }
 +
 +            register("kotlin-stdlib-java-common") {
@@ -220,6 +231,11 @@ index aa8f21b..dd6a2ae 100644
 +                    matchingRegex.set("kotlin.coroutines.experimental.migration(\$|\\.).*")
 +                    suppress.set(true)
 +                }
++               sourceLink {
++                   localDirectory.set(file("$kotlin_sources/kotlin-stdlib"))
++                   remoteUrl.set(new URL("https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib/jvm/src"))
++                   remoteLineSuffix.set("#L")
++               }
 +            }
 +
 +
diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt
index a5b61b1d4c..ba51a1ceb8 100644
--- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt
+++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/kotlin/StdlibGradleIntegrationTest.kt
@@ -52,8 +52,8 @@ class StdlibGradleIntegrationTest(override val versions: BuildVersions) : Abstra
 
         projectOutputLocation.allHtmlFiles().forEach { file ->
             assertContainsNoErrorClass(file)
-//            assertNoUnresolvedLinks(file)
-//            assertNoHrefToMissingLocalFileOrDirectory(file)
+            assertNoUnresolvedLinks(file)
+            assertNoHrefToMissingLocalFileOrDirectory(file)
             assertNoEmptyLinks(file)
             assertNoEmptySpans(file)
             assertNoUnsubstitutedTemplatesInHtml(file)
diff --git a/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/AbstractIntegrationTest.kt b/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/AbstractIntegrationTest.kt
index fcf6b9ddb5..d2f6722372 100644
--- a/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/AbstractIntegrationTest.kt
+++ b/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/AbstractIntegrationTest.kt
@@ -71,7 +71,7 @@ abstract class AbstractIntegrationTest {
                 hrefSplits.first()
             } else href
 
-            val targetFile = if (href.startsWith("file")) {
+            val targetFile = if (href.startsWith("file://")) {
                 File(URL(hrefWithoutAnchors).path)
             } else {
                 File(file.parent, hrefWithoutAnchors)

From 6b1da6166e06bae67e4c29bab9adebd199cba602 Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Sat, 12 Feb 2022 21:56:22 +0300
Subject: [PATCH 07/17] Minor refactor

---
 core/api/core.api                             | 55 ++++++++++++++-----
 plugins/base/api/base.api                     | 28 ++++++++--
 .../base-test-utils/api/base-test-utils.api   |  5 +-
 .../documentables/DefaultPageCreator.kt       | 52 +++---------------
 plugins/javadoc/api/javadoc.api               | 24 ++++++--
 5 files changed, 91 insertions(+), 73 deletions(-)

diff --git a/core/api/core.api b/core/api/core.api
index d3b4817b9f..f003bf9494 100644
--- a/core/api/core.api
+++ b/core/api/core.api
@@ -3440,15 +3440,20 @@ public abstract interface class org/jetbrains/dokka/model/properties/WithExtraPr
 	public abstract fun withNewExtras (Lorg/jetbrains/dokka/model/properties/PropertyContainer;)Ljava/lang/Object;
 }
 
-public abstract interface class org/jetbrains/dokka/pages/ClasslikePage : org/jetbrains/dokka/pages/ContentPage {
+public abstract interface class org/jetbrains/dokka/pages/ClasslikePage : org/jetbrains/dokka/pages/ContentPage, org/jetbrains/dokka/pages/WithDocumentables {
+}
+
+public final class org/jetbrains/dokka/pages/ClasslikePage$DefaultImpls {
+	public static fun getDocumentable (Lorg/jetbrains/dokka/pages/ClasslikePage;)Lorg/jetbrains/dokka/model/Documentable;
 }
 
 public final class org/jetbrains/dokka/pages/ClasslikePageNode : org/jetbrains/dokka/pages/ClasslikePage {
-	public fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Lorg/jetbrains/dokka/model/Documentable;Ljava/util/List;Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Lorg/jetbrains/dokka/model/Documentable;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V
+	public synthetic fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Ljava/util/List;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getChildren ()Ljava/util/List;
 	public fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
 	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
+	public fun getDocumentables ()Ljava/util/List;
 	public fun getDri ()Ljava/util/Set;
 	public fun getEmbeddedResources ()Ljava/util/List;
 	public fun getName ()Ljava/lang/String;
@@ -3839,7 +3844,6 @@ public final class org/jetbrains/dokka/pages/ContentNodesKt {
 
 public abstract interface class org/jetbrains/dokka/pages/ContentPage : org/jetbrains/dokka/pages/PageNode {
 	public abstract fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
-	public abstract fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
 	public abstract fun getDri ()Ljava/util/Set;
 	public abstract fun getEmbeddedResources ()Ljava/util/List;
 	public abstract fun modified (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Ljava/util/List;Ljava/util/List;)Lorg/jetbrains/dokka/pages/ContentPage;
@@ -3982,15 +3986,20 @@ public final class org/jetbrains/dokka/pages/ListStyle : java/lang/Enum, org/jet
 	public static fun values ()[Lorg/jetbrains/dokka/pages/ListStyle;
 }
 
-public abstract interface class org/jetbrains/dokka/pages/MemberPage : org/jetbrains/dokka/pages/ContentPage {
+public abstract interface class org/jetbrains/dokka/pages/MemberPage : org/jetbrains/dokka/pages/ContentPage, org/jetbrains/dokka/pages/WithDocumentables {
+}
+
+public final class org/jetbrains/dokka/pages/MemberPage$DefaultImpls {
+	public static fun getDocumentable (Lorg/jetbrains/dokka/pages/MemberPage;)Lorg/jetbrains/dokka/model/Documentable;
 }
 
 public final class org/jetbrains/dokka/pages/MemberPageNode : org/jetbrains/dokka/pages/MemberPage {
-	public fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Lorg/jetbrains/dokka/model/Documentable;Ljava/util/List;Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Lorg/jetbrains/dokka/model/Documentable;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V
+	public synthetic fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Ljava/util/List;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getChildren ()Ljava/util/List;
 	public fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
 	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
+	public fun getDocumentables ()Ljava/util/List;
 	public fun getDri ()Ljava/util/Set;
 	public fun getEmbeddedResources ()Ljava/util/List;
 	public fun getName ()Ljava/lang/String;
@@ -4000,15 +4009,20 @@ public final class org/jetbrains/dokka/pages/MemberPageNode : org/jetbrains/dokk
 	public fun modified (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Ljava/util/List;Ljava/util/List;)Lorg/jetbrains/dokka/pages/MemberPageNode;
 }
 
-public abstract interface class org/jetbrains/dokka/pages/ModulePage : org/jetbrains/dokka/pages/ContentPage {
+public abstract interface class org/jetbrains/dokka/pages/ModulePage : org/jetbrains/dokka/pages/ContentPage, org/jetbrains/dokka/pages/WithDocumentables {
+}
+
+public final class org/jetbrains/dokka/pages/ModulePage$DefaultImpls {
+	public static fun getDocumentable (Lorg/jetbrains/dokka/pages/ModulePage;)Lorg/jetbrains/dokka/model/Documentable;
 }
 
 public final class org/jetbrains/dokka/pages/ModulePageNode : org/jetbrains/dokka/pages/RootPageNode, org/jetbrains/dokka/pages/ModulePage {
-	public fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Lorg/jetbrains/dokka/model/Documentable;Ljava/util/List;Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Lorg/jetbrains/dokka/model/Documentable;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V
+	public synthetic fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/List;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getChildren ()Ljava/util/List;
 	public fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
 	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
+	public fun getDocumentables ()Ljava/util/List;
 	public fun getDri ()Ljava/util/Set;
 	public fun getEmbeddedResources ()Ljava/util/List;
 	public fun getName ()Ljava/lang/String;
@@ -4027,7 +4041,6 @@ public final class org/jetbrains/dokka/pages/MultimoduleRootPageNode : org/jetbr
 	public synthetic fun <init> (Ljava/util/Set;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getChildren ()Ljava/util/List;
 	public fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
-	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
 	public fun getDri ()Ljava/util/Set;
 	public fun getEmbeddedResources ()Ljava/util/List;
 	public fun getName ()Ljava/lang/String;
@@ -4041,15 +4054,20 @@ public final class org/jetbrains/dokka/pages/MultimoduleTable : org/jetbrains/do
 	public static final field INSTANCE Lorg/jetbrains/dokka/pages/MultimoduleTable;
 }
 
-public abstract interface class org/jetbrains/dokka/pages/PackagePage : org/jetbrains/dokka/pages/ContentPage {
+public abstract interface class org/jetbrains/dokka/pages/PackagePage : org/jetbrains/dokka/pages/ContentPage, org/jetbrains/dokka/pages/WithDocumentables {
+}
+
+public final class org/jetbrains/dokka/pages/PackagePage$DefaultImpls {
+	public static fun getDocumentable (Lorg/jetbrains/dokka/pages/PackagePage;)Lorg/jetbrains/dokka/model/Documentable;
 }
 
 public final class org/jetbrains/dokka/pages/PackagePageNode : org/jetbrains/dokka/pages/PackagePage {
-	public fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Lorg/jetbrains/dokka/model/Documentable;Ljava/util/List;Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Lorg/jetbrains/dokka/model/Documentable;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V
+	public synthetic fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Ljava/util/List;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getChildren ()Ljava/util/List;
 	public fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
 	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
+	public fun getDocumentables ()Ljava/util/List;
 	public fun getDri ()Ljava/util/Set;
 	public fun getEmbeddedResources ()Ljava/util/List;
 	public fun getName ()Ljava/lang/String;
@@ -4264,6 +4282,15 @@ public final class org/jetbrains/dokka/pages/UtilsKt {
 	public static final fun recursiveMapTransform (Lorg/jetbrains/dokka/pages/ContentNode;Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function1;)Lorg/jetbrains/dokka/pages/ContentNode;
 }
 
+public abstract interface class org/jetbrains/dokka/pages/WithDocumentables {
+	public abstract fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
+	public abstract fun getDocumentables ()Ljava/util/List;
+}
+
+public final class org/jetbrains/dokka/pages/WithDocumentables$DefaultImpls {
+	public static fun getDocumentable (Lorg/jetbrains/dokka/pages/WithDocumentables;)Lorg/jetbrains/dokka/model/Documentable;
+}
+
 public final class org/jetbrains/dokka/pages/WrongRendererTypeException : java/lang/Exception {
 	public fun <init> (Lkotlin/reflect/KClass;)V
 	public final fun component1 ()Lkotlin/reflect/KClass;
diff --git a/plugins/base/api/base.api b/plugins/base/api/base.api
index b17b405294..593023af43 100644
--- a/plugins/base/api/base.api
+++ b/plugins/base/api/base.api
@@ -68,25 +68,29 @@ public final class org/jetbrains/dokka/base/DokkaBase : org/jetbrains/dokka/plug
 
 public final class org/jetbrains/dokka/base/DokkaBaseConfiguration : org/jetbrains/dokka/plugability/ConfigurableBlock {
 	public static final field Companion Lorg/jetbrains/dokka/base/DokkaBaseConfiguration$Companion;
+	public static final field mergeNoExpectActualDeclarationsDefault Z
 	public static final field separateInheritedMembersDefault Z
 	public fun <init> ()V
-	public fun <init> (Ljava/util/List;Ljava/util/List;ZLjava/lang/String;)V
-	public synthetic fun <init> (Ljava/util/List;Ljava/util/List;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/util/List;Ljava/util/List;ZLjava/lang/String;Z)V
+	public synthetic fun <init> (Ljava/util/List;Ljava/util/List;ZLjava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun component1 ()Ljava/util/List;
 	public final fun component2 ()Ljava/util/List;
 	public final fun component3 ()Z
 	public final fun component4 ()Ljava/lang/String;
-	public final fun copy (Ljava/util/List;Ljava/util/List;ZLjava/lang/String;)Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;
-	public static synthetic fun copy$default (Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;Ljava/util/List;Ljava/util/List;ZLjava/lang/String;ILjava/lang/Object;)Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;
+	public final fun component5 ()Z
+	public final fun copy (Ljava/util/List;Ljava/util/List;ZLjava/lang/String;Z)Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;
+	public static synthetic fun copy$default (Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;Ljava/util/List;Ljava/util/List;ZLjava/lang/String;ZILjava/lang/Object;)Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getCustomAssets ()Ljava/util/List;
 	public final fun getCustomStyleSheets ()Ljava/util/List;
 	public final fun getFooterMessage ()Ljava/lang/String;
+	public final fun getMergeNoExpectActualDeclarations ()Z
 	public final fun getSeparateInheritedMembers ()Z
 	public fun hashCode ()I
 	public final fun setCustomAssets (Ljava/util/List;)V
 	public final fun setCustomStyleSheets (Ljava/util/List;)V
 	public final fun setFooterMessage (Ljava/lang/String;)V
+	public final fun setMergeNoExpectActualDeclarations (Z)V
 	public final fun setSeparateInheritedMembers (Z)V
 	public fun toString ()Ljava/lang/String;
 }
@@ -1342,28 +1346,38 @@ public class org/jetbrains/dokka/base/translators/documentables/DefaultPageCreat
 	public fun <init> (Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;Lorg/jetbrains/dokka/base/transformers/pages/comments/CommentsToContentConverter;Lorg/jetbrains/dokka/base/signatures/SignatureProvider;Lorg/jetbrains/dokka/utilities/DokkaLogger;Ljava/util/List;)V
 	public synthetic fun <init> (Lorg/jetbrains/dokka/base/DokkaBaseConfiguration;Lorg/jetbrains/dokka/base/transformers/pages/comments/CommentsToContentConverter;Lorg/jetbrains/dokka/base/signatures/SignatureProvider;Lorg/jetbrains/dokka/utilities/DokkaLogger;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	protected fun contentForBrief (Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder$DocumentableContentBuilder;Lorg/jetbrains/dokka/model/Documentable;)V
-	protected fun contentForClasslike (Lorg/jetbrains/dokka/model/DClasslike;)Lorg/jetbrains/dokka/pages/ContentGroup;
+	protected fun contentForClasslikesAndEntries (Ljava/util/List;)Lorg/jetbrains/dokka/pages/ContentGroup;
+	protected fun contentForComments (Ljava/util/List;Z)Ljava/util/List;
+	protected fun contentForComments (Lorg/jetbrains/dokka/links/DRI;Ljava/util/Set;Ljava/util/Map;Z)Ljava/util/List;
 	protected fun contentForComments (Lorg/jetbrains/dokka/model/Documentable;Z)Ljava/util/List;
+	public static synthetic fun contentForComments$default (Lorg/jetbrains/dokka/base/translators/documentables/DefaultPageCreator;Ljava/util/List;ZILjava/lang/Object;)Ljava/util/List;
+	public static synthetic fun contentForComments$default (Lorg/jetbrains/dokka/base/translators/documentables/DefaultPageCreator;Lorg/jetbrains/dokka/links/DRI;Ljava/util/Set;Ljava/util/Map;ZILjava/lang/Object;)Ljava/util/List;
 	public static synthetic fun contentForComments$default (Lorg/jetbrains/dokka/base/translators/documentables/DefaultPageCreator;Lorg/jetbrains/dokka/model/Documentable;ZILjava/lang/Object;)Ljava/util/List;
 	protected fun contentForDescription (Lorg/jetbrains/dokka/model/Documentable;)Ljava/util/List;
-	protected fun contentForEnumEntry (Lorg/jetbrains/dokka/model/DEnumEntry;)Lorg/jetbrains/dokka/pages/ContentGroup;
 	protected fun contentForFunction (Lorg/jetbrains/dokka/model/DFunction;)Lorg/jetbrains/dokka/pages/ContentGroup;
 	protected fun contentForMember (Lorg/jetbrains/dokka/model/Documentable;)Lorg/jetbrains/dokka/pages/ContentGroup;
+	protected fun contentForMembers (Ljava/util/List;)Lorg/jetbrains/dokka/pages/ContentGroup;
 	protected fun contentForModule (Lorg/jetbrains/dokka/model/DModule;)Lorg/jetbrains/dokka/pages/ContentGroup;
 	protected fun contentForPackage (Lorg/jetbrains/dokka/model/DPackage;)Lorg/jetbrains/dokka/pages/ContentGroup;
 	protected fun contentForProperty (Lorg/jetbrains/dokka/model/DProperty;)Lorg/jetbrains/dokka/pages/ContentGroup;
+	protected fun contentForScope (Ljava/util/Set;Ljava/util/Set;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/Map;)Lorg/jetbrains/dokka/pages/ContentGroup;
 	protected fun contentForScope (Lorg/jetbrains/dokka/model/WithScope;Lorg/jetbrains/dokka/links/DRI;Ljava/util/Set;)Lorg/jetbrains/dokka/pages/ContentGroup;
+	protected fun contentForScopes (Ljava/util/List;Ljava/util/Set;)Lorg/jetbrains/dokka/pages/ContentGroup;
 	protected fun divergentBlock (Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder$DocumentableContentBuilder;Ljava/lang/String;Ljava/util/Collection;Lorg/jetbrains/dokka/pages/ContentKind;Lorg/jetbrains/dokka/model/properties/PropertyContainer;)V
 	public static synthetic fun divergentBlock$default (Lorg/jetbrains/dokka/base/translators/documentables/DefaultPageCreator;Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder$DocumentableContentBuilder;Ljava/lang/String;Ljava/util/Collection;Lorg/jetbrains/dokka/pages/ContentKind;Lorg/jetbrains/dokka/model/properties/PropertyContainer;ILjava/lang/Object;)V
 	protected fun getContentBuilder ()Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder;
 	public final fun getCustomTagContentProviders ()Ljava/util/List;
 	public final fun getLogger ()Lorg/jetbrains/dokka/utilities/DokkaLogger;
+	protected final fun getMergeNoExpectActualDeclarations ()Z
 	protected final fun getSeparateInheritedMembers ()Z
 	public fun pageForClasslike (Lorg/jetbrains/dokka/model/DClasslike;)Lorg/jetbrains/dokka/pages/ClasslikePageNode;
+	public fun pageForClasslikesAndEntries (Ljava/util/List;)Lorg/jetbrains/dokka/pages/ClasslikePageNode;
 	public fun pageForEnumEntry (Lorg/jetbrains/dokka/model/DEnumEntry;)Lorg/jetbrains/dokka/pages/ClasslikePageNode;
 	public fun pageForFunction (Lorg/jetbrains/dokka/model/DFunction;)Lorg/jetbrains/dokka/pages/MemberPageNode;
+	public fun pageForFunctions (Ljava/util/List;)Lorg/jetbrains/dokka/pages/MemberPageNode;
 	public fun pageForModule (Lorg/jetbrains/dokka/model/DModule;)Lorg/jetbrains/dokka/pages/ModulePageNode;
 	public fun pageForPackage (Lorg/jetbrains/dokka/model/DPackage;)Lorg/jetbrains/dokka/pages/PackagePageNode;
+	public fun pageForProperties (Ljava/util/List;)Lorg/jetbrains/dokka/pages/MemberPageNode;
 	public fun pageForProperty (Lorg/jetbrains/dokka/model/DProperty;)Lorg/jetbrains/dokka/pages/MemberPageNode;
 	protected fun toHeaderString (Lorg/jetbrains/dokka/model/doc/TagWrapper;)Ljava/lang/String;
 }
@@ -1462,6 +1476,8 @@ public class org/jetbrains/dokka/base/translators/documentables/PageContentBuild
 	public static synthetic fun linkNode$default (Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder$DocumentableContentBuilder;Ljava/lang/String;Lorg/jetbrains/dokka/links/DRI;Lorg/jetbrains/dokka/pages/DCI;Ljava/util/Set;Ljava/util/Set;Lorg/jetbrains/dokka/model/properties/PropertyContainer;ILjava/lang/Object;)Lorg/jetbrains/dokka/pages/ContentDRILink;
 	public final fun list (Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Lkotlin/jvm/functions/Function2;)V
 	public static synthetic fun list$default (Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder$DocumentableContentBuilder;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V
+	public final fun multiBlock (Ljava/lang/String;ILorg/jetbrains/dokka/pages/Kind;Ljava/lang/Iterable;Ljava/util/Set;Ljava/util/Set;Lorg/jetbrains/dokka/model/properties/PropertyContainer;ZZLjava/util/List;ZLkotlin/jvm/functions/Function3;)V
+	public static synthetic fun multiBlock$default (Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder$DocumentableContentBuilder;Ljava/lang/String;ILorg/jetbrains/dokka/pages/Kind;Ljava/lang/Iterable;Ljava/util/Set;Ljava/util/Set;Lorg/jetbrains/dokka/model/properties/PropertyContainer;ZZLjava/util/List;ZLkotlin/jvm/functions/Function3;ILjava/lang/Object;)V
 	public final fun operator (Ljava/lang/String;)V
 	public final fun orderedList (Lorg/jetbrains/dokka/pages/Kind;Ljava/util/Set;Ljava/util/Set;Lorg/jetbrains/dokka/model/properties/PropertyContainer;Lkotlin/jvm/functions/Function1;)V
 	public static synthetic fun orderedList$default (Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder$DocumentableContentBuilder;Lorg/jetbrains/dokka/pages/Kind;Ljava/util/Set;Ljava/util/Set;Lorg/jetbrains/dokka/model/properties/PropertyContainer;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
diff --git a/plugins/base/base-test-utils/api/base-test-utils.api b/plugins/base/base-test-utils/api/base-test-utils.api
index b6ec84a15c..5d5b6db20e 100644
--- a/plugins/base/base-test-utils/api/base-test-utils.api
+++ b/plugins/base/base-test-utils/api/base-test-utils.api
@@ -62,11 +62,10 @@ public final class org/jetbrains/dokka/base/testApi/testRunner/BaseTestMethods :
 }
 
 public final class renderers/RawTestPage : org/jetbrains/dokka/pages/RootPageNode, org/jetbrains/dokka/pages/ContentPage {
-	public fun <init> (Lorg/jetbrains/dokka/pages/ContentNode;Ljava/lang/String;Ljava/util/Set;Lorg/jetbrains/dokka/model/Documentable;Ljava/util/List;Ljava/util/List;)V
-	public synthetic fun <init> (Lorg/jetbrains/dokka/pages/ContentNode;Ljava/lang/String;Ljava/util/Set;Lorg/jetbrains/dokka/model/Documentable;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lorg/jetbrains/dokka/pages/ContentNode;Ljava/lang/String;Ljava/util/Set;Ljava/util/List;Ljava/util/List;)V
+	public synthetic fun <init> (Lorg/jetbrains/dokka/pages/ContentNode;Ljava/lang/String;Ljava/util/Set;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getChildren ()Ljava/util/List;
 	public fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
-	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
 	public fun getDri ()Ljava/util/Set;
 	public fun getEmbeddedResources ()Ljava/util/List;
 	public fun getName ()Ljava/lang/String;
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index ef3c007a4c..74ddca8278 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -8,6 +8,7 @@ import org.jetbrains.dokka.base.transformers.documentables.CallableExtensions
 import org.jetbrains.dokka.base.transformers.documentables.ClashingDriIdentifier
 import org.jetbrains.dokka.base.transformers.documentables.InheritorsInfo
 import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter
+import org.jetbrains.dokka.base.transformers.pages.tags.CustomTagContentProvider
 import org.jetbrains.dokka.base.translators.documentables.PageContentBuilder.DocumentableContentBuilder
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.*
@@ -54,27 +55,9 @@ open class DefaultPageCreator(
                 p.properties.mapNotNull(::pageForProperty)
     )
 
-    open fun pageForEnumEntry(e: DEnumEntry): ClasslikePageNode =
-        ClasslikePageNode(
-            e.nameAfterClash(), contentForEnumEntry(e), setOf(e.dri), listOf(e),
-            e.classlikes.renameClashingDocumentable().map(::pageForClasslike) +
-                    e.filteredFunctions.renameClashingDocumentable().map(::pageForFunction) +
-                    e.filteredProperties.renameClashingDocumentable().mapNotNull(::pageForProperty)
-        )
-
-    open fun pageForClasslike(c: DClasslike): ClasslikePageNode {
-        val constructors = if (c is WithConstructors) c.constructors else emptyList()
+    open fun pageForEnumEntry(e: DEnumEntry): ClasslikePageNode = pageForClasslikesAndEntries(listOf(e))
 
-        return ClasslikePageNode(
-            c.nameAfterClash(), contentForClasslike(c), setOf(c.dri), listOf(c),
-            constructors.map(::pageForFunction) +
-                    c.classlikes.renameClashingDocumentable().map(::pageForClasslike) +
-                    c.filteredFunctions.renameClashingDocumentable().map(::pageForFunction) +
-                    c.filteredProperties.renameClashingDocumentable().mapNotNull(::pageForProperty) +
-                    if (c is DEnum) c.entries.map(::pageForEnumEntry) else emptyList()
-
-        )
-    }
+    open fun pageForClasslike(c: DClasslike): ClasslikePageNode = pageForClasslikesAndEntries(listOf(c))
 
     open fun pageForClasslikesAndEntries(documentables: List<Documentable>): ClasslikePageNode {
         val dri = documentables.dri.also {
@@ -133,10 +116,8 @@ open class DefaultPageCreator(
         else -> null
     } as? T?
 
-    /**
-     * Ignore DRI extra because of Enum Entries have [org.jetbrains.dokka.links.EnumEntryDRIExtra]
-     */
     private fun <T : Documentable> List<T>.mergeClashingDocumentable(): List<List<T>> =
+        // (unusual case) to merge classlike and enum entry ignore DRI extra because of enum entries have [org.jetbrains.dokka.links.EnumEntryDRIExtra]
         groupBy { it.dri.copy(extra = null) }.values.toList()
 
     open fun pageForFunction(f: DFunction) = MemberPageNode(f.nameAfterClash(), contentForFunction(f), setOf(f.dri), listOf(f))
@@ -325,29 +306,15 @@ open class DefaultPageCreator(
     private fun Iterable<DFunction>.sorted() =
         sortedWith(compareBy({ it.name }, { it.parameters.size }, { it.dri.toString() }))
 
-    protected open fun contentForEnumEntry(e: DEnumEntry) = contentBuilder.contentFor(e) {
-        group(kind = ContentKind.Cover) {
-            cover(e.name)
-            sourceSetDependentHint(e.dri, e.sourceSets.toSet()) {
-                +buildSignature(e)
-                +contentForDescription(e)
-            }
-        }
-        group(styles = setOf(ContentStyle.TabbedContent)) {
-            +contentForComments(e)
-            +contentForScope(e, e.dri, e.sourceSets)
-        }
-    }
-
     /**
      * @param documentables a list of [DClasslike] and [DEnumEntry] with the same dri in different sourceSets
      */
     protected open fun contentForClasslikesAndEntries(documentables: List<Documentable>): ContentGroup =
         contentBuilder.contentFor(documentables.dri, documentables.sourceSets) {
-            val cs = documentables.filterIsInstance<DClasslike>()
+            val classlikes = documentables.filterIsInstance<DClasslike>()
 
             @Suppress("UNCHECKED_CAST")
-            val extensions = (cs as List<WithExtraProperties<DClasslike>>).flatMap {
+            val extensions = (classlikes as List<WithExtraProperties<DClasslike>>).flatMap {
                 it.extra[CallableExtensions]?.extensions
                     ?.filterIsInstance<Documentable>().orEmpty()
             }
@@ -366,7 +333,7 @@ open class DefaultPageCreator(
 
             group(styles = setOf(ContentStyle.TabbedContent), sourceSets = mainSourcesetData + extensions.sourceSets) {
                 +contentForComments(documentables)
-                val csWithConstructor = cs.filterIsInstance<WithConstructors>()
+                val csWithConstructor = classlikes.filterIsInstance<WithConstructors>()
                 if (csWithConstructor.isNotEmpty()) {
                     val constructorsToDocumented = csWithConstructor.flatMap { it.constructors }
                     multiBlock(
@@ -394,7 +361,7 @@ open class DefaultPageCreator(
                         }
                     }
                 }
-                val csEnum = cs.filterIsInstance<DEnum>()
+                val csEnum = classlikes.filterIsInstance<DEnum>()
                 if (csEnum.isNotEmpty()) {
                     multiBlock(
                         "Entries",
@@ -432,9 +399,6 @@ open class DefaultPageCreator(
             }
         }
 
-
-    protected open fun contentForClasslike(c: DClasslike) =  contentForClasslikesAndEntries(listOf(c))
-
     @Suppress("UNCHECKED_CAST")
     private inline fun <reified T : TagWrapper> GroupedTags.withTypeUnnamed(): SourceSetDependent<T> =
         (this[T::class] as List<Pair<DokkaSourceSet, T>>?)?.toMap().orEmpty()
diff --git a/plugins/javadoc/api/javadoc.api b/plugins/javadoc/api/javadoc.api
index bfea687ae2..0eabce5ca4 100644
--- a/plugins/javadoc/api/javadoc.api
+++ b/plugins/javadoc/api/javadoc.api
@@ -56,6 +56,7 @@ public final class org/jetbrains/dokka/javadoc/pages/AllClassesPage : org/jetbra
 	public final fun getClasses ()Ljava/util/List;
 	public fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
 	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
+	public fun getDocumentables ()Ljava/util/List;
 	public fun getDri ()Ljava/util/Set;
 	public fun getEmbeddedResources ()Ljava/util/List;
 	public fun getName ()Ljava/lang/String;
@@ -90,6 +91,7 @@ public final class org/jetbrains/dokka/javadoc/pages/DeprecatedPage : org/jetbra
 	public fun getChildren ()Ljava/util/List;
 	public fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
 	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
+	public fun getDocumentables ()Ljava/util/List;
 	public fun getDri ()Ljava/util/Set;
 	public final fun getElements ()Ljava/util/Map;
 	public fun getEmbeddedResources ()Ljava/util/List;
@@ -158,6 +160,7 @@ public final class org/jetbrains/dokka/javadoc/pages/IndexPage : org/jetbrains/d
 	public fun getChildren ()Ljava/util/List;
 	public fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
 	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
+	public fun getDocumentables ()Ljava/util/List;
 	public fun getDri ()Ljava/util/Set;
 	public final fun getElements ()Ljava/util/List;
 	public fun getEmbeddedResources ()Ljava/util/List;
@@ -176,8 +179,8 @@ public final class org/jetbrains/dokka/javadoc/pages/JavaContentGroupBuilder {
 }
 
 public final class org/jetbrains/dokka/javadoc/pages/JavadocClasslikePageNode : org/jetbrains/dokka/javadoc/pages/JavadocPageNode, org/jetbrains/dokka/javadoc/pages/NavigableJavadocNode, org/jetbrains/dokka/javadoc/pages/WithBrief, org/jetbrains/dokka/javadoc/pages/WithJavadocExtra, org/jetbrains/dokka/javadoc/pages/WithNavigable, org/jetbrains/dokka/pages/ClasslikePage {
-	public fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/javadoc/pages/JavadocContentNode;Ljava/util/Set;Lorg/jetbrains/dokka/javadoc/pages/JavadocSignatureContentNode;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lorg/jetbrains/dokka/model/Documentable;Ljava/util/List;Ljava/util/List;Lorg/jetbrains/dokka/model/properties/PropertyContainer;)V
-	public synthetic fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/javadoc/pages/JavadocContentNode;Ljava/util/Set;Lorg/jetbrains/dokka/javadoc/pages/JavadocSignatureContentNode;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lorg/jetbrains/dokka/model/Documentable;Ljava/util/List;Ljava/util/List;Lorg/jetbrains/dokka/model/properties/PropertyContainer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/javadoc/pages/JavadocContentNode;Ljava/util/Set;Lorg/jetbrains/dokka/javadoc/pages/JavadocSignatureContentNode;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lorg/jetbrains/dokka/model/properties/PropertyContainer;)V
+	public synthetic fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/javadoc/pages/JavadocContentNode;Ljava/util/Set;Lorg/jetbrains/dokka/javadoc/pages/JavadocSignatureContentNode;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lorg/jetbrains/dokka/model/properties/PropertyContainer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getAllNavigables ()Ljava/util/List;
 	public final fun getAnchorables ()Ljava/util/List;
 	public fun getBrief ()Ljava/util/List;
@@ -189,6 +192,7 @@ public final class org/jetbrains/dokka/javadoc/pages/JavadocClasslikePageNode :
 	public fun getDRI ()Lorg/jetbrains/dokka/links/DRI;
 	public final fun getDescription ()Ljava/util/List;
 	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
+	public fun getDocumentables ()Ljava/util/List;
 	public fun getDri ()Ljava/util/Set;
 	public fun getEmbeddedResources ()Ljava/util/List;
 	public final fun getEntries ()Ljava/util/List;
@@ -353,6 +357,7 @@ public final class org/jetbrains/dokka/javadoc/pages/JavadocModulePageNode : org
 	public synthetic fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
 	public fun getDRI ()Lorg/jetbrains/dokka/links/DRI;
 	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
+	public fun getDocumentables ()Ljava/util/List;
 	public fun getDri ()Ljava/util/Set;
 	public fun getEmbeddedResources ()Ljava/util/List;
 	public fun getExtra ()Lorg/jetbrains/dokka/model/properties/PropertyContainer;
@@ -367,14 +372,15 @@ public final class org/jetbrains/dokka/javadoc/pages/JavadocModulePageNode : org
 }
 
 public final class org/jetbrains/dokka/javadoc/pages/JavadocPackagePageNode : org/jetbrains/dokka/javadoc/pages/JavadocPageNode, org/jetbrains/dokka/javadoc/pages/NavigableJavadocNode, org/jetbrains/dokka/javadoc/pages/WithNavigable, org/jetbrains/dokka/pages/PackagePage {
-	public fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/javadoc/pages/JavadocContentNode;Ljava/util/Set;Lorg/jetbrains/dokka/model/Documentable;Ljava/util/List;Ljava/util/List;)V
-	public synthetic fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/javadoc/pages/JavadocContentNode;Ljava/util/Set;Lorg/jetbrains/dokka/model/Documentable;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/javadoc/pages/JavadocContentNode;Ljava/util/Set;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V
+	public synthetic fun <init> (Ljava/lang/String;Lorg/jetbrains/dokka/javadoc/pages/JavadocContentNode;Ljava/util/Set;Ljava/util/List;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getAllNavigables ()Ljava/util/List;
 	public fun getChildren ()Ljava/util/List;
 	public fun getContent ()Lorg/jetbrains/dokka/javadoc/pages/JavadocContentNode;
 	public synthetic fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
 	public fun getDRI ()Lorg/jetbrains/dokka/links/DRI;
 	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
+	public fun getDocumentables ()Ljava/util/List;
 	public fun getDri ()Ljava/util/Set;
 	public fun getEmbeddedResources ()Ljava/util/List;
 	public fun getId ()Ljava/lang/String;
@@ -383,7 +389,11 @@ public final class org/jetbrains/dokka/javadoc/pages/JavadocPackagePageNode : or
 	public fun modified (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Ljava/util/List;Ljava/util/List;)Lorg/jetbrains/dokka/pages/ContentPage;
 }
 
-public abstract interface class org/jetbrains/dokka/javadoc/pages/JavadocPageNode : org/jetbrains/dokka/pages/ContentPage {
+public abstract interface class org/jetbrains/dokka/javadoc/pages/JavadocPageNode : org/jetbrains/dokka/pages/ContentPage, org/jetbrains/dokka/pages/WithDocumentables {
+}
+
+public final class org/jetbrains/dokka/javadoc/pages/JavadocPageNode$DefaultImpls {
+	public static fun getDocumentable (Lorg/jetbrains/dokka/javadoc/pages/JavadocPageNode;)Lorg/jetbrains/dokka/model/Documentable;
 }
 
 public final class org/jetbrains/dokka/javadoc/pages/JavadocParameterNode : org/jetbrains/dokka/javadoc/pages/AnchorableJavadocNode, org/jetbrains/dokka/javadoc/pages/WithJavadocExtra {
@@ -573,11 +583,13 @@ public final class org/jetbrains/dokka/javadoc/pages/TreeViewInstaller : org/jet
 }
 
 public final class org/jetbrains/dokka/javadoc/pages/TreeViewPage : org/jetbrains/dokka/javadoc/pages/JavadocPageNode {
-	public fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Lorg/jetbrains/dokka/model/Documentable;Lorg/jetbrains/dokka/pages/PageNode;)V
+	public fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Ljava/util/List;Lorg/jetbrains/dokka/pages/PageNode;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/util/List;Ljava/util/List;Ljava/util/Set;Ljava/util/List;Lorg/jetbrains/dokka/pages/PageNode;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getChildren ()Ljava/util/List;
 	public final fun getClasses ()Ljava/util/List;
 	public fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
 	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
+	public fun getDocumentables ()Ljava/util/List;
 	public fun getDri ()Ljava/util/Set;
 	public fun getEmbeddedResources ()Ljava/util/List;
 	public final fun getKind ()Ljava/lang/String;

From cbe8caf5a35a71640f4c8cd6fa0bac1be71990d4 Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Sun, 13 Feb 2022 01:45:55 +0300
Subject: [PATCH 08/17] Fix integration test

---
 .../kotlin/org/jetbrains/dokka/it/AbstractIntegrationTest.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/AbstractIntegrationTest.kt b/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/AbstractIntegrationTest.kt
index d2f6722372..c5ea0093c1 100644
--- a/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/AbstractIntegrationTest.kt
+++ b/integration-tests/src/main/kotlin/org/jetbrains/dokka/it/AbstractIntegrationTest.kt
@@ -71,7 +71,7 @@ abstract class AbstractIntegrationTest {
                 hrefSplits.first()
             } else href
 
-            val targetFile = if (href.startsWith("file://")) {
+            val targetFile = if (href.startsWith("file:/")) {
                 File(URL(hrefWithoutAnchors).path)
             } else {
                 File(file.parent, hrefWithoutAnchors)

From ae6470abb5937819ba099ccd42400dd275f3a9d5 Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Mon, 14 Feb 2022 23:40:03 +0300
Subject: [PATCH 09/17] Rename to `mergeImplicitExpectActualDeclarations`

---
 plugins/base/src/main/kotlin/DokkaBaseConfiguration.kt        | 4 ++--
 .../kotlin/translators/documentables/DefaultPageCreator.kt    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/base/src/main/kotlin/DokkaBaseConfiguration.kt b/plugins/base/src/main/kotlin/DokkaBaseConfiguration.kt
index 86a6016a1b..8ea8818ded 100644
--- a/plugins/base/src/main/kotlin/DokkaBaseConfiguration.kt
+++ b/plugins/base/src/main/kotlin/DokkaBaseConfiguration.kt
@@ -9,13 +9,13 @@ data class DokkaBaseConfiguration(
     var customAssets: List<File> = defaultCustomAssets,
     var separateInheritedMembers: Boolean = separateInheritedMembersDefault,
     var footerMessage: String = defaultFooterMessage,
-    var mergeNoExpectActualDeclarations: Boolean = mergeNoExpectActualDeclarationsDefault
+    var mergeImplicitExpectActualDeclarations: Boolean = mergeImplicitExpectActualDeclarationsDefault
 ) : ConfigurableBlock {
     companion object {
         val defaultFooterMessage = "© ${Year.now().value} Copyright"
         val defaultCustomStyleSheets: List<File> = emptyList()
         val defaultCustomAssets: List<File> = emptyList()
         const val separateInheritedMembersDefault: Boolean = false
-        const val mergeNoExpectActualDeclarationsDefault: Boolean = false
+        const val mergeImplicitExpectActualDeclarationsDefault: Boolean = false
     }
 }
\ No newline at end of file
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index 74ddca8278..d93a03f04e 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -36,7 +36,7 @@ open class DefaultPageCreator(
     protected open val contentBuilder = PageContentBuilder(commentsToContentConverter, signatureProvider, logger)
 
     protected val mergeNoExpectActualDeclarations =
-        configuration?.mergeNoExpectActualDeclarations ?: DokkaBaseConfiguration.mergeNoExpectActualDeclarationsDefault
+        configuration?.mergeImplicitExpectActualDeclarations ?: DokkaBaseConfiguration.mergeImplicitExpectActualDeclarationsDefault
 
     protected val separateInheritedMembers =
         configuration?.separateInheritedMembers ?: DokkaBaseConfiguration.separateInheritedMembersDefault

From bfaec2ed79532a90466d9c1348e5f06703441a76 Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Mon, 14 Feb 2022 23:56:49 +0300
Subject: [PATCH 10/17] Add doc

---
 docs/src/doc/docs/user_guide/base-specific/frontend.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/src/doc/docs/user_guide/base-specific/frontend.md b/docs/src/doc/docs/user_guide/base-specific/frontend.md
index 851e16a025..e6802639dd 100644
--- a/docs/src/doc/docs/user_guide/base-specific/frontend.md
+++ b/docs/src/doc/docs/user_guide/base-specific/frontend.md
@@ -39,6 +39,12 @@ Keep in mind that this value will be passed exactly to the output html, so it ha
 By setting a boolean property `separateInheritedMembers` dokka will split inherited members (like functions, properties etc.) 
 from ones declared in viewed class. Separated members will have it's own tabs on the page.
 
+## Merging declarations with name clashing 
+
+By setting a boolean property `mergeImplicitExpectActualDeclarations` dokka will merge declarations that do not have `expect`/`actual` keywords but have the same fully qualified name. 
+The declarations will be displayed on one page.
+By default, it is disabled. The page names of such declaration have a prefix that is the name of source set. 
+
 ### Examples
 In order to override a logo and style it accordingly a css file named `logo-styles.css` is needed:
 ```css

From b2a487914f1c4b0bd43beb839fc7432ed7966100 Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Tue, 15 Feb 2022 13:27:08 +0300
Subject: [PATCH 11/17] Fix

---
 core/src/main/kotlin/pages/PageNodes.kt       |  12 +-
 .../gradle/projects/stdlib/stdlib.diff        |   2 +-
 .../pages/samples/SamplesTransformer.kt       |   4 +-
 .../sourcelinks/SourceLinksTransformer.kt     |   2 +-
 ...rgeImplicitExpectActualDeclarationsTest.kt | 311 ++++++++++++++++++
 5 files changed, 321 insertions(+), 10 deletions(-)
 create mode 100644 plugins/base/src/test/kotlin/transformers/MergeImplicitExpectActualDeclarationsTest.kt

diff --git a/core/src/main/kotlin/pages/PageNodes.kt b/core/src/main/kotlin/pages/PageNodes.kt
index b6a794b1e0..75e27dccab 100644
--- a/core/src/main/kotlin/pages/PageNodes.kt
+++ b/core/src/main/kotlin/pages/PageNodes.kt
@@ -20,6 +20,12 @@ interface ContentPage : PageNode {
     val dri: Set<DRI>
     val embeddedResources: List<String>
 
+    @Deprecated("Deprecated. Remove its usages from your code.",
+        ReplaceWith("documentables.firstOrNull()")
+    )
+    val documentable: Documentable?
+        get() = if (this is WithDocumentables) this.documentables.firstOrNull() else null
+
     fun modified(
         name: String = this.name,
         content: ContentNode = this.content,
@@ -31,12 +37,6 @@ interface ContentPage : PageNode {
 
 interface WithDocumentables {
     val documentables: List<Documentable>
-
-    @Deprecated("Deprecated. Remove its usages from your code.",
-        ReplaceWith("documentables.firstOrNull()")
-    )
-    val documentable: Documentable?
-        get() = documentables.firstOrNull()
 }
 
 abstract class RootPageNode(val forceTopLevelName: Boolean = false) : PageNode {
diff --git a/integration-tests/gradle/projects/stdlib/stdlib.diff b/integration-tests/gradle/projects/stdlib/stdlib.diff
index a63bbedeec..20404297ef 100644
--- a/integration-tests/gradle/projects/stdlib/stdlib.diff
+++ b/integration-tests/gradle/projects/stdlib/stdlib.diff
@@ -163,7 +163,7 @@ index aa8f21b..dd6a2ae 100644
 +    task dokkaStdlib(type: org.jetbrains.dokka.gradle.DokkaTask) {
 +        outputDirectory.set(new File(outputDir, "/kotlin-stdlib"))
 +        moduleName.set("kotlin-stdlib")
-+        pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase": """{ "mergeNoExpectActualDeclarations": "true" }"""])
++        pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase": """{ "mergeImplicitExpectActualDeclarations": "true" }"""])
 +        dokkaSourceSets {
 +            register("kotlin-stdlib-common") {
 +                skipDeprecated.set(false)
diff --git a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
index 627fea2020..db133bb823 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
@@ -41,9 +41,9 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer {
                 }
             }
 
-            samples?.fold(page as ContentPage) { acc, sample ->
+            samples?.fold(page as ContentPage) { acc, (sampleSourceSet, sample) ->
                     acc.modified(
-                        content = acc.content.addSample(page, sample.first, sample.second.name, analysis),
+                        content = acc.content.addSample(page, sampleSourceSet, sample.name, analysis),
                         embeddedResources = acc.embeddedResources + kotlinPlaygroundScript
                     )
                 } ?: page
diff --git a/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt
index f5c58704f2..933050552a 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt
@@ -36,7 +36,7 @@ class SourceLinksTransformer(val context: DokkaContext) : PageTransformer {
                 is WithDocumentables ->
                     node.documentables.filterIsInstance<WithSources>().flatMap { resolveSources(it) }
                     .takeIf { it.isNotEmpty() }
-                    ?.let { (node as ContentPage).addSourcesContent(it) }
+                    ?.let { node.addSourcesContent(it) }
                     ?: node
                 else -> node
             }
diff --git a/plugins/base/src/test/kotlin/transformers/MergeImplicitExpectActualDeclarationsTest.kt b/plugins/base/src/test/kotlin/transformers/MergeImplicitExpectActualDeclarationsTest.kt
new file mode 100644
index 0000000000..a2e21bf247
--- /dev/null
+++ b/plugins/base/src/test/kotlin/transformers/MergeImplicitExpectActualDeclarationsTest.kt
@@ -0,0 +1,311 @@
+package transformers
+
+import org.jetbrains.dokka.DokkaConfiguration
+import org.jetbrains.dokka.PluginConfigurationImpl
+import org.jetbrains.dokka.base.DokkaBase
+import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest
+import org.jetbrains.dokka.model.childrenOfType
+import org.jetbrains.dokka.model.dfs
+import org.jetbrains.dokka.model.firstChildOfType
+import org.jetbrains.dokka.pages.*
+import org.jetbrains.kotlin.utils.addIfNotNull
+import org.junit.jupiter.api.Test
+import utils.assertNotNull
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+
+class MergeImplicitExpectActualDeclarationsTest : BaseAbstractTest() {
+
+    private fun configuration(switchOn: Boolean) = dokkaConfiguration {
+        sourceSets {
+            val common = sourceSet {
+                name = "common"
+                displayName = "common"
+                analysisPlatform = "common"
+                sourceRoots = listOf("src/commonMain/kotlin/pageMerger/Test.kt")
+            }
+            val js = sourceSet {
+                name = "js"
+                displayName = "js"
+                analysisPlatform = "js"
+                sourceRoots = listOf("src/jsMain/kotlin/pageMerger/Test.kt")
+            }
+            val jvm = sourceSet {
+                name = "jvm"
+                displayName = "jvm"
+                analysisPlatform = "jvm"
+                sourceRoots = listOf("src/jvmMain/kotlin/pageMerger/Test.kt")
+            }
+        }
+        pluginsConfigurations.addIfNotNull(
+            PluginConfigurationImpl(
+                DokkaBase::class.qualifiedName!!,
+                DokkaConfiguration.SerializationFormat.JSON,
+                """{ "mergeImplicitExpectActualDeclarations": $switchOn }""",
+            )
+        )
+    }
+
+    private fun ClasslikePageNode.findSectionWithName(name: String) : ContentNode? {
+        var sectionHeader: ContentHeader? = null
+        return content.dfs { node ->
+            node.children.filterIsInstance<ContentHeader>().any { header ->
+                header.children.firstOrNull { it is ContentText && it.text == name }?.also { sectionHeader = header } != null
+            }
+        }?.children?.dropWhile { child -> child != sectionHeader  }?.drop(1)?.firstOrNull()
+    }
+
+    @Test
+    fun `should merge fun`() {
+        testInline(
+            """
+
+                |/src/jvmMain/kotlin/pageMerger/Test.kt
+                |package pageMerger
+                |
+                |class classA {
+                |   fun method1(): String
+                |}
+                |
+                |/src/jsMain/kotlin/pageMerger/Test.kt
+                |package pageMerger
+                |
+                |class classA {
+                |   fun method1(): Int
+                |}
+                |
+        """.trimMargin(),
+            configuration(true),
+            cleanupOutput = true
+        ) {
+            pagesTransformationStage = { root ->
+                val classPage = root.dfs { it.name == "classA" } as? ClasslikePageNode
+                assertNotNull(classPage, "Tested class not found!")
+
+                val functions = classPage.findSectionWithName("Functions").assertNotNull("Functions")
+                val method1 = functions.children.singleOrNull().assertNotNull("method1")
+
+                assertEquals(
+                    2,
+                    method1.firstChildOfType<ContentDivergentGroup>().childrenOfType<ContentDivergentInstance>().size,
+                    "Incorrect number of divergent instances found"
+                )
+
+                val methodPage = root.dfs { it.name == "method1" } as? MemberPageNode
+                assertNotNull(methodPage, "Tested method not found!")
+
+                val divergentGroup = methodPage.content.dfs { it is ContentDivergentGroup } as? ContentDivergentGroup
+
+                assertEquals(
+                    2,
+                    divergentGroup?.childrenOfType<ContentDivergentInstance>()?.size,
+                    "Incorrect number of divergent instances found in method page"
+                )
+            }
+        }
+    }
+
+    @Test
+    fun `should merge method and prop`() {
+        testInline(
+            """
+                |/src/jvmMain/kotlin/pageMerger/Test.kt
+                |package pageMerger
+                |
+                |class classA {
+                |   fun method1(): String
+                |}
+                |
+                |/src/jsMain/kotlin/pageMerger/Test.kt
+                |package pageMerger
+                |
+                |class classA {
+                |   val prop1: Int
+                |}
+                |
+        """.trimMargin(),
+            configuration(true),
+            cleanupOutput = true
+        ) {
+            pagesTransformationStage = { root ->
+                val classPage = root.dfs { it.name == "classA" } as? ClasslikePageNode
+                assertNotNull(classPage, "Tested class not found!")
+
+                val props = classPage.findSectionWithName("Properties").assertNotNull("Properties")
+                val prop1 = props.children.singleOrNull().assertNotNull("prop1")
+
+                val functions = classPage.findSectionWithName("Functions").assertNotNull("Functions")
+                val method1 = functions.children.singleOrNull().assertNotNull("method1")
+            }
+        }
+    }
+
+    @Test
+    fun `should merge prop`() {
+        testInline(
+            """
+                |/src/jvmMain/kotlin/pageMerger/Test.kt
+                |package pageMerger
+                |
+                |class classA {
+                |   val prop1: String
+                |}
+                |
+                |/src/jsMain/kotlin/pageMerger/Test.kt
+                |package pageMerger
+                |
+                |class classA {
+                |   val prop1: Int
+                |}
+                |
+        """.trimMargin(),
+            configuration(true),
+            cleanupOutput = true
+        ) {
+            pagesTransformationStage = { root ->
+                val classPage = root.dfs { it.name == "classA" } as? ClasslikePageNode
+                assertNotNull(classPage, "Tested class not found!")
+
+                val props = classPage.findSectionWithName("Properties").assertNotNull("Properties")
+                val prop1 = props.children.singleOrNull().assertNotNull("prop1")
+
+                assertEquals(
+                    2,
+                    prop1.firstChildOfType<PlatformHintedContent>().inner.children.size,
+                    "Incorrect number of divergent instances found"
+                )
+
+                val propPage = root.dfs { it.name == "prop1" } as? MemberPageNode
+                assertNotNull(propPage, "Tested method not found!")
+
+                val divergentGroup = propPage.content.dfs { it is ContentDivergentGroup } as? ContentDivergentGroup
+
+                assertEquals(
+                    2,
+                    divergentGroup?.childrenOfType<ContentDivergentInstance>()?.size,
+                    "Incorrect number of divergent instances found in method page"
+                )
+            }
+        }
+    }
+
+    @Test
+    fun `should merge enum and class`() {
+        testInline(
+            """
+                |/src/jvmMain/kotlin/pageMerger/Test.kt
+                |package pageMerger
+                |
+                |class classA {
+                |   val prop1: String
+                |}
+                |
+                |/src/jsMain/kotlin/pageMerger/Test.kt
+                |package pageMerger
+                |
+                |enum class classA {
+                |   ENTRY
+                |}
+                |
+        """.trimMargin(),
+            configuration(true),
+            cleanupOutput = true
+        ) {
+            pagesTransformationStage = { root ->
+                val classPage = root.dfs { it.name == "classA" } as? ClasslikePageNode
+                assertNotNull(classPage, "Tested class not found!")
+
+                val entries = classPage.findSectionWithName("Entries").assertNotNull("Entries")
+                val entry = entries.children.singleOrNull().assertNotNull("ENTRY")
+
+                val props = classPage.findSectionWithName("Properties").assertNotNull("Properties")
+                assertEquals(
+                    3,
+                    props.children.size,
+                    "Incorrect number of properties found in method page"
+                )
+            }
+        }
+    }
+
+    fun PageNode.childrenRec(): List<PageNode> = listOf(this) + children.flatMap { it.childrenRec() }
+
+    @Test
+    fun `should merge nested class and enum entry (synthetic case)`() {
+        testInline(
+            """
+                |/src/jvmMain/kotlin/pageMerger/Test.kt
+                |package pageMerger
+                |
+                |class classA {
+                |   class SMTH {
+                |       fun method1(): String
+                |   }
+                |}
+                |
+                |/src/jsMain/kotlin/pageMerger/Test.kt
+                |package pageMerger
+                |
+                |enum class classA {
+                |   SMTH;
+                |   fun method1(): Int
+                |}
+                |
+        """.trimMargin(),
+            configuration(true),
+            cleanupOutput = true
+        ) {
+            pagesTransformationStage = { root ->
+                val classPage = root.dfs { it.name == "SMTH" } as? ClasslikePageNode
+                assertNotNull(classPage, "Tested class not found!")
+
+                val functions = classPage.findSectionWithName("Functions").assertNotNull("Functions")
+                val method1 = functions.children.singleOrNull().assertNotNull("method1")
+
+                assertEquals(
+                    2,
+                    method1.firstChildOfType<ContentDivergentGroup>().childrenOfType<ContentDivergentInstance>().size,
+                    "Incorrect number of divergent instances found"
+                )
+            }
+        }
+    }
+
+    /**
+     * There is a case when a property and fun from different source sets
+     * have the same name so pages have the same urls respectively.
+     */
+    @Test
+    fun `should no merge prop and method with the same name`() {
+        testInline(
+            """
+                |/src/jvmMain/kotlin/pageMerger/Test.kt
+                |package pageMerger
+                |
+                |class classA {
+                |   fun merged():String
+                |}
+                |
+                |/src/jsMain/kotlin/pageMerger/Test.kt
+                |package pageMerger
+                |
+                |class classA {
+                |   val merged:String
+                |}
+                |
+        """.trimMargin(),
+            configuration(true),
+            cleanupOutput = true
+        ) {
+            pagesTransformationStage = { root ->
+                val allChildren = root.childrenRec().filterIsInstance<MemberPageNode>()
+
+                assertEquals(
+                    1,
+                    allChildren.filter { it.name == "merged" }.size,
+                    "Incorrect number of fun pages"
+                )
+            }
+        }
+    }
+}
\ No newline at end of file

From c4d81841f073459502c2c75812156468980f6353 Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Tue, 15 Feb 2022 15:42:39 +0300
Subject: [PATCH 12/17] Do not merge enum entry and nested class

---
 .../documentables/DefaultPageCreator.kt       | 67 ++++++++++++-------
 .../documentables/PageContentBuilder.kt       |  4 +-
 ...rgeImplicitExpectActualDeclarationsTest.kt |  9 ++-
 3 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index d93a03f04e..c5029ca610 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -47,19 +47,45 @@ open class DefaultPageCreator(
     open fun pageForPackage(p: DPackage): PackagePageNode = PackagePageNode(
         p.name, contentForPackage(p), setOf(p.dri), listOf(p),
         if (mergeNoExpectActualDeclarations)
-            p.classlikes.mergeClashingDocumentable().map(::pageForClasslikesAndEntries) +
+            p.classlikes.mergeClashingDocumentable().map(::pageForClasslikes) +
                     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)
+        else
+            p.classlikes.renameClashingDocumentable().map(::pageForClasslike) +
+                    p.functions.renameClashingDocumentable().map(::pageForFunction) +
+                    p.properties.mapNotNull(::pageForProperty)
     )
 
-    open fun pageForEnumEntry(e: DEnumEntry): ClasslikePageNode = pageForClasslikesAndEntries(listOf(e))
+    open fun pageForEnumEntry(e: DEnumEntry): ClasslikePageNode = pageForEnumEntries(listOf(e))
 
-    open fun pageForClasslike(c: DClasslike): ClasslikePageNode = pageForClasslikesAndEntries(listOf(c))
+    open fun pageForClasslike(c: DClasslike): ClasslikePageNode = pageForClasslikes(listOf(c))
 
-    open fun pageForClasslikesAndEntries(documentables: List<Documentable>): ClasslikePageNode {
+    open fun pageForEnumEntries(documentables: List<DEnumEntry>): ClasslikePageNode {
+        val dri = documentables.dri.also {
+            if (it.size != 1) {
+                logger.error("Documentable dri should have the same one ${it.first()} inside the one page!")
+            }
+        }
+
+        val classlikes = documentables.flatMap { it.classlikes }
+        val functions = documentables.flatMap { it.filteredFunctions }
+        val props = documentables.flatMap { it.filteredProperties }
+
+        val childrenPages =  if (mergeNoExpectActualDeclarations)
+                            functions.mergeClashingDocumentable().map(::pageForFunctions) +
+                            props.mergeClashingDocumentable().map(::pageForProperties)
+                else
+                    classlikes.renameClashingDocumentable().map(::pageForClasslike) +
+                            functions.renameClashingDocumentable().map(::pageForFunction) +
+                            props.renameClashingDocumentable().mapNotNull(::pageForProperty)
+
+        return ClasslikePageNode(
+            documentables.first().nameAfterClash(), contentForClasslikesAndEntries(documentables), dri, documentables,
+            childrenPages
+        )
+    }
+
+    open fun pageForClasslikes(documentables: List<DClasslike>): ClasslikePageNode {
         val dri = documentables.dri.also {
             if (it.size != 1) {
                 logger.error("Documentable dri should have the same one ${it.first()} inside the one page!")
@@ -67,19 +93,18 @@ open class DefaultPageCreator(
         }
 
         val constructors = documentables.flatMap { if (it is WithConstructors) it.constructors else emptyList() }
-        @Suppress("UNCHECKED_CAST")
-        val scopes = documentables as List<WithScope>
 
-        val classlikes = scopes.flatMap { it.classlikes }
-        val functions = scopes.flatMap { it.filteredFunctions }
-        val props = scopes.flatMap { it.filteredProperties }
-        val entries = scopes.flatMap { if (it is DEnum) it.entries else emptyList() }
+        val classlikes = documentables.flatMap { it.classlikes }
+        val functions = documentables.flatMap { it.filteredFunctions }
+        val props = documentables.flatMap { it.filteredProperties }
+        val entries = documentables.flatMap { if (it is DEnum) it.entries else emptyList() }
 
         val childrenPages = constructors.map(::pageForFunction) +
                 if (mergeNoExpectActualDeclarations)
-                    (classlikes + entries).mergeClashingDocumentable().map(::pageForClasslikesAndEntries) +
+                    classlikes.mergeClashingDocumentable().map(::pageForClasslikes) +
                             functions.mergeClashingDocumentable().map(::pageForFunctions) +
-                            props.mergeClashingDocumentable().map(::pageForProperties)
+                            props.mergeClashingDocumentable().map(::pageForProperties) +
+                            entries.mergeClashingDocumentable().map(::pageForEnumEntries)
                 else
                     classlikes.renameClashingDocumentable().map(::pageForClasslike) +
                             functions.renameClashingDocumentable().map(::pageForFunction) +
@@ -117,8 +142,7 @@ open class DefaultPageCreator(
     } as? T?
 
     private fun <T : Documentable> List<T>.mergeClashingDocumentable(): List<List<T>> =
-        // (unusual case) to merge classlike and enum entry ignore DRI extra because of enum entries have [org.jetbrains.dokka.links.EnumEntryDRIExtra]
-        groupBy { it.dri.copy(extra = null) }.values.toList()
+        groupBy { it.dri }.values.toList()
 
     open fun pageForFunction(f: DFunction) = MemberPageNode(f.nameAfterClash(), contentForFunction(f), setOf(f.dri), listOf(f))
 
@@ -215,16 +239,13 @@ open class DefaultPageCreator(
         scopes: List<WithScope>,
         sourceSets: Set<DokkaSourceSet>
     ): ContentGroup {
-        val types = listOf(
-            scopes.flatMap { it.classlikes },
-            scopes.filterIsInstance<DPackage>().flatMap { it.typealiases }
-        ).flatten()
-        val inheritors = scopes.fold(HashMap<DokkaSourceSet, List<DRI>>()) { acc, scope ->
+        val types = scopes.flatMap { it.classlikes } + scopes.filterIsInstance<DPackage>().flatMap { it.typealiases }
+        val inheritors = scopes.fold(mutableMapOf<DokkaSourceSet, List<DRI>>()) { acc, scope ->
             val inheritorsForScope = scope.safeAs<WithExtraProperties<Documentable>>()?.let { it.extra[InheritorsInfo] }?.let { inheritors ->
                 inheritors.value.filter { it.value.isNotEmpty() }
             }.orEmpty()
             inheritorsForScope.forEach { (k,v) ->
-                acc[k]?.plus(v) ?: acc.put(k,v)
+                acc.compute(k) { _, value -> value?.plus(v) ?: v }
             }
             acc
         }
diff --git a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
index fe2bc4abf0..7b6fbc7a39 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
@@ -227,11 +227,11 @@ open class PageContentBuilder(
             }
         }
 
-        fun multiBlock(
+        fun <T : Pair<String, List<Documentable>>> multiBlock(
             name: String,
             level: Int,
             kind: Kind = ContentKind.Main,
-            groupedElements: Iterable<Pair<String, List<Documentable>>>,
+            groupedElements: Iterable<T>,
             sourceSets: Set<DokkaSourceSet> = mainSourcesetData,
             styles: Set<Style> = mainStyles,
             extra: PropertyContainer<ContentNode> = mainExtra,
diff --git a/plugins/base/src/test/kotlin/transformers/MergeImplicitExpectActualDeclarationsTest.kt b/plugins/base/src/test/kotlin/transformers/MergeImplicitExpectActualDeclarationsTest.kt
index a2e21bf247..7f387e8f4c 100644
--- a/plugins/base/src/test/kotlin/transformers/MergeImplicitExpectActualDeclarationsTest.kt
+++ b/plugins/base/src/test/kotlin/transformers/MergeImplicitExpectActualDeclarationsTest.kt
@@ -231,16 +231,15 @@ class MergeImplicitExpectActualDeclarationsTest : BaseAbstractTest() {
     fun PageNode.childrenRec(): List<PageNode> = listOf(this) + children.flatMap { it.childrenRec() }
 
     @Test
-    fun `should merge nested class and enum entry (synthetic case)`() {
+    fun `should merge enum entries`() {
         testInline(
             """
                 |/src/jvmMain/kotlin/pageMerger/Test.kt
                 |package pageMerger
                 |
-                |class classA {
-                |   class SMTH {
-                |       fun method1(): String
-                |   }
+                |enum class classA {
+                |   SMTH;
+                |   fun method1(): Int
                 |}
                 |
                 |/src/jsMain/kotlin/pageMerger/Test.kt

From 40052a8f42d1f1153716ad2c1f0ac35583c9609a Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Tue, 15 Feb 2022 15:43:02 +0300
Subject: [PATCH 13/17] Format

---
 .../dokka/javadoc/pages/JavadocPageNodes.kt   | 53 ++++++++++---------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/JavadocPageNodes.kt b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/JavadocPageNodes.kt
index df93e58ce6..6c7691cde7 100644
--- a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/JavadocPageNodes.kt
+++ b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/JavadocPageNodes.kt
@@ -43,7 +43,7 @@ class JavadocModulePageNode(
     JavadocPageNode,
     ModulePage {
 
-    override val documentables:List<Documentable> = emptyList()
+    override val documentables: List<Documentable> = emptyList()
     override val embeddedResources: List<String> = emptyList()
     override fun modified(name: String, children: List<PageNode>): RootPageNode =
         JavadocModulePageNode(name, content, children, dri, extra)
@@ -66,7 +66,7 @@ class JavadocPackagePageNode(
     override val content: JavadocContentNode,
     override val dri: Set<DRI>,
 
-    override val documentables:List<Documentable> = emptyList(),
+    override val documentables: List<Documentable> = emptyList(),
     override val children: List<PageNode> = emptyList(),
     override val embeddedResources: List<String> = listOf()
 ) : JavadocPageNode,
@@ -182,7 +182,7 @@ class JavadocClasslikePageNode(
     val classlikes: List<JavadocClasslikePageNode>,
     val properties: List<JavadocPropertyNode>,
     override val brief: List<ContentNode>,
-    override val documentables:List<Documentable> = emptyList(),
+    override val documentables: List<Documentable> = emptyList(),
     override val children: List<PageNode> = emptyList(),
     override val embeddedResources: List<String> = listOf(),
     override val extra: PropertyContainer<DClasslike> = PropertyContainer.empty(),
@@ -254,7 +254,7 @@ class AllClassesPage(val classes: List<JavadocClasslikePageNode>) : JavadocPageN
     override val name: String = "All Classes"
     override val dri: Set<DRI> = setOf(DRI.topLevel)
 
-    override val documentables:List<Documentable> = emptyList()
+    override val documentables: List<Documentable> = emptyList()
     override val embeddedResources: List<String> = emptyList()
 
     override val content: ContentNode =
@@ -285,7 +285,7 @@ class DeprecatedPage(
 ) : JavadocPageNode {
     override val name: String = "deprecated"
     override val dri: Set<DRI> = setOf(DRI.topLevel)
-    override val documentables:List<Documentable> = emptyList()
+    override val documentables: List<Documentable> = emptyList()
     override val children: List<PageNode> = emptyList()
     override val embeddedResources: List<String> = listOf()
 
@@ -339,7 +339,7 @@ class IndexPage(
 ) : JavadocPageNode {
     override val name: String = "index-$id"
     override val dri: Set<DRI> = setOf(DRI.topLevel)
-    override val documentables:List<Documentable> = emptyList()
+    override val documentables: List<Documentable> = emptyList()
     override val children: List<PageNode> = emptyList()
     override val embeddedResources: List<String> = listOf()
     val title: String = "${keys[id - 1]}-index"
@@ -370,7 +370,7 @@ class TreeViewPage(
     val packages: List<JavadocPackagePageNode>?,
     val classes: List<JavadocClasslikePageNode>?,
     override val dri: Set<DRI>,
-    override val documentables:List<Documentable> = emptyList(),
+    override val documentables: List<Documentable> = emptyList(),
     val root: PageNode
 ) : JavadocPageNode {
     init {
@@ -473,23 +473,25 @@ class TreeViewPage(
             listOf(psi to l) + l.flatMap { gatherPsiClasses(it) }
         }
 
-        val psiInheritanceTree = childrenDocumentables.flatMap { (_, v) -> (v as? WithSources)?.sources?.values.orEmpty() }
-            .filterIsInstance<PsiDocumentableSource>().mapNotNull { it.psi as? PsiClass }.flatMap(::gatherPsiClasses)
-            .flatMap { entry -> entry.second.map { it to entry.first } }
-            .let {
-                it + it.map { it.second to null }
-            }
-            .groupBy({ it.first }) { it.second }
-            .map { it.key to it.value.filterNotNull().distinct() }
-            .map { (k, v) ->
-                InheritanceNode(
-                    DRI.from(k),
-                    v.map { InheritanceNode(DRI.from(it)) },
-                    k.supers.filter { it.isInterface }.map { DRI.from(it) },
-                    k.isInterface
-                )
-
-            }
+        val psiInheritanceTree =
+            childrenDocumentables.flatMap { (_, v) -> (v as? WithSources)?.sources?.values.orEmpty() }
+                .filterIsInstance<PsiDocumentableSource>().mapNotNull { it.psi as? PsiClass }
+                .flatMap(::gatherPsiClasses)
+                .flatMap { entry -> entry.second.map { it to entry.first } }
+                .let {
+                    it + it.map { it.second to null }
+                }
+                .groupBy({ it.first }) { it.second }
+                .map { it.key to it.value.filterNotNull().distinct() }
+                .map { (k, v) ->
+                    InheritanceNode(
+                        DRI.from(k),
+                        v.map { InheritanceNode(DRI.from(it)) },
+                        k.supers.filter { it.isInterface }.map { DRI.from(it) },
+                        k.isInterface
+                    )
+
+                }
 
         val descriptorInheritanceTree = descriptorMap.flatMap { (_, v) ->
             v.typeConstructor.supertypes
@@ -528,7 +530,8 @@ class TreeViewPage(
 
     private fun getDocumentableEntries(node: WithDocumentables): List<Pair<DRI, Documentable>> =
         node.documentables.map { it.dri to it } +
-                (node as? ContentPage)?.children?.filterIsInstance<WithDocumentables>()?.flatMap(::getDocumentableEntries).orEmpty()
+                (node as? ContentPage)?.children?.filterIsInstance<WithDocumentables>()
+                    ?.flatMap(::getDocumentableEntries).orEmpty()
 
     private fun getDescriptorMap(): Map<DRI, ClassDescriptor> {
         val map: MutableMap<DRI, ClassDescriptor> = mutableMapOf()

From 123a4ed157456079f75f287cf28ef96ee569b431 Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Tue, 15 Feb 2022 16:20:10 +0300
Subject: [PATCH 14/17] Add new test

---
 ...rgeImplicitExpectActualDeclarationsTest.kt | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/plugins/base/src/test/kotlin/transformers/MergeImplicitExpectActualDeclarationsTest.kt b/plugins/base/src/test/kotlin/transformers/MergeImplicitExpectActualDeclarationsTest.kt
index 7f387e8f4c..ad3b5d38b9 100644
--- a/plugins/base/src/test/kotlin/transformers/MergeImplicitExpectActualDeclarationsTest.kt
+++ b/plugins/base/src/test/kotlin/transformers/MergeImplicitExpectActualDeclarationsTest.kt
@@ -16,6 +16,7 @@ import kotlin.test.assertNotNull
 
 class MergeImplicitExpectActualDeclarationsTest : BaseAbstractTest() {
 
+    @Suppress("UNUSED_VARIABLE")
     private fun configuration(switchOn: Boolean) = dokkaConfiguration {
         sourceSets {
             val common = sourceSet {
@@ -28,6 +29,7 @@ class MergeImplicitExpectActualDeclarationsTest : BaseAbstractTest() {
                 name = "js"
                 displayName = "js"
                 analysisPlatform = "js"
+                dependentSourceSets = setOf(common.value.sourceSetID)
                 sourceRoots = listOf("src/jsMain/kotlin/pageMerger/Test.kt")
             }
             val jvm = sourceSet {
@@ -307,4 +309,44 @@ class MergeImplicitExpectActualDeclarationsTest : BaseAbstractTest() {
             }
         }
     }
+
+    @Test
+    fun `should always merge constructor`() {
+        testInline(
+            """
+                |/src/commonMain/kotlin/pageMerger/Test.kt
+                |package pageMerger
+                |
+                |expect class classA(a: Int)
+                |
+                |/src/jsMain/kotlin/pageMerger/Test.kt
+                |package pageMerger
+                |
+                |actual class classA(a: Int)
+        """.trimMargin(),
+            configuration(false),
+            cleanupOutput = true
+        ) {
+            pagesTransformationStage = { root ->
+                val classPage = root.dfs { it.name == "classA" } as? ClasslikePageNode
+                assertNotNull(classPage, "Tested class not found!")
+
+                val constructors = classPage.findSectionWithName("Constructors").assertNotNull("Constructors")
+
+                assertEquals(
+                    1,
+                    constructors.children.size,
+                    "Incorrect number of constructors"
+                )
+
+                val platformHinted = constructors.dfs { it is PlatformHintedContent } as? PlatformHintedContent
+
+                assertEquals(
+                    2,
+                    platformHinted?.sourceSets?.size,
+                    "Incorrect number of source sets"
+                )
+            }
+        }
+    }
 }
\ No newline at end of file

From 55aa3485e1d92ee78e57c525aff4de09f28631ff Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Tue, 15 Feb 2022 16:26:16 +0300
Subject: [PATCH 15/17] Fix API

---
 core/api/core.api                                    | 12 +++++++-----
 plugins/base/api/base.api                            |  9 +++++----
 plugins/base/base-test-utils/api/base-test-utils.api |  1 +
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/core/api/core.api b/core/api/core.api
index f003bf9494..063f56c5fe 100644
--- a/core/api/core.api
+++ b/core/api/core.api
@@ -3844,12 +3844,14 @@ public final class org/jetbrains/dokka/pages/ContentNodesKt {
 
 public abstract interface class org/jetbrains/dokka/pages/ContentPage : org/jetbrains/dokka/pages/PageNode {
 	public abstract fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
+	public abstract fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
 	public abstract fun getDri ()Ljava/util/Set;
 	public abstract fun getEmbeddedResources ()Ljava/util/List;
 	public abstract fun modified (Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Ljava/util/List;Ljava/util/List;)Lorg/jetbrains/dokka/pages/ContentPage;
 }
 
 public final class org/jetbrains/dokka/pages/ContentPage$DefaultImpls {
+	public static fun getDocumentable (Lorg/jetbrains/dokka/pages/ContentPage;)Lorg/jetbrains/dokka/model/Documentable;
 	public static synthetic fun modified$default (Lorg/jetbrains/dokka/pages/ContentPage;Ljava/lang/String;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/Set;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lorg/jetbrains/dokka/pages/ContentPage;
 }
 
@@ -4036,11 +4038,16 @@ public final class org/jetbrains/dokka/pages/ModulePageNode : org/jetbrains/dokk
 public abstract interface class org/jetbrains/dokka/pages/MultimoduleRootPage : org/jetbrains/dokka/pages/ContentPage {
 }
 
+public final class org/jetbrains/dokka/pages/MultimoduleRootPage$DefaultImpls {
+	public static fun getDocumentable (Lorg/jetbrains/dokka/pages/MultimoduleRootPage;)Lorg/jetbrains/dokka/model/Documentable;
+}
+
 public final class org/jetbrains/dokka/pages/MultimoduleRootPageNode : org/jetbrains/dokka/pages/RootPageNode, org/jetbrains/dokka/pages/MultimoduleRootPage {
 	public fun <init> (Ljava/util/Set;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/List;)V
 	public synthetic fun <init> (Ljava/util/Set;Lorg/jetbrains/dokka/pages/ContentNode;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getChildren ()Ljava/util/List;
 	public fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
+	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
 	public fun getDri ()Ljava/util/Set;
 	public fun getEmbeddedResources ()Ljava/util/List;
 	public fun getName ()Ljava/lang/String;
@@ -4283,14 +4290,9 @@ public final class org/jetbrains/dokka/pages/UtilsKt {
 }
 
 public abstract interface class org/jetbrains/dokka/pages/WithDocumentables {
-	public abstract fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
 	public abstract fun getDocumentables ()Ljava/util/List;
 }
 
-public final class org/jetbrains/dokka/pages/WithDocumentables$DefaultImpls {
-	public static fun getDocumentable (Lorg/jetbrains/dokka/pages/WithDocumentables;)Lorg/jetbrains/dokka/model/Documentable;
-}
-
 public final class org/jetbrains/dokka/pages/WrongRendererTypeException : java/lang/Exception {
 	public fun <init> (Lkotlin/reflect/KClass;)V
 	public final fun component1 ()Lkotlin/reflect/KClass;
diff --git a/plugins/base/api/base.api b/plugins/base/api/base.api
index 593023af43..295d00ff57 100644
--- a/plugins/base/api/base.api
+++ b/plugins/base/api/base.api
@@ -68,7 +68,7 @@ public final class org/jetbrains/dokka/base/DokkaBase : org/jetbrains/dokka/plug
 
 public final class org/jetbrains/dokka/base/DokkaBaseConfiguration : org/jetbrains/dokka/plugability/ConfigurableBlock {
 	public static final field Companion Lorg/jetbrains/dokka/base/DokkaBaseConfiguration$Companion;
-	public static final field mergeNoExpectActualDeclarationsDefault Z
+	public static final field mergeImplicitExpectActualDeclarationsDefault Z
 	public static final field separateInheritedMembersDefault Z
 	public fun <init> ()V
 	public fun <init> (Ljava/util/List;Ljava/util/List;ZLjava/lang/String;Z)V
@@ -84,13 +84,13 @@ public final class org/jetbrains/dokka/base/DokkaBaseConfiguration : org/jetbrai
 	public final fun getCustomAssets ()Ljava/util/List;
 	public final fun getCustomStyleSheets ()Ljava/util/List;
 	public final fun getFooterMessage ()Ljava/lang/String;
-	public final fun getMergeNoExpectActualDeclarations ()Z
+	public final fun getMergeImplicitExpectActualDeclarations ()Z
 	public final fun getSeparateInheritedMembers ()Z
 	public fun hashCode ()I
 	public final fun setCustomAssets (Ljava/util/List;)V
 	public final fun setCustomStyleSheets (Ljava/util/List;)V
 	public final fun setFooterMessage (Ljava/lang/String;)V
-	public final fun setMergeNoExpectActualDeclarations (Z)V
+	public final fun setMergeImplicitExpectActualDeclarations (Z)V
 	public final fun setSeparateInheritedMembers (Z)V
 	public fun toString ()Ljava/lang/String;
 }
@@ -1371,7 +1371,8 @@ public class org/jetbrains/dokka/base/translators/documentables/DefaultPageCreat
 	protected final fun getMergeNoExpectActualDeclarations ()Z
 	protected final fun getSeparateInheritedMembers ()Z
 	public fun pageForClasslike (Lorg/jetbrains/dokka/model/DClasslike;)Lorg/jetbrains/dokka/pages/ClasslikePageNode;
-	public fun pageForClasslikesAndEntries (Ljava/util/List;)Lorg/jetbrains/dokka/pages/ClasslikePageNode;
+	public fun pageForClasslikes (Ljava/util/List;)Lorg/jetbrains/dokka/pages/ClasslikePageNode;
+	public fun pageForEnumEntries (Ljava/util/List;)Lorg/jetbrains/dokka/pages/ClasslikePageNode;
 	public fun pageForEnumEntry (Lorg/jetbrains/dokka/model/DEnumEntry;)Lorg/jetbrains/dokka/pages/ClasslikePageNode;
 	public fun pageForFunction (Lorg/jetbrains/dokka/model/DFunction;)Lorg/jetbrains/dokka/pages/MemberPageNode;
 	public fun pageForFunctions (Ljava/util/List;)Lorg/jetbrains/dokka/pages/MemberPageNode;
diff --git a/plugins/base/base-test-utils/api/base-test-utils.api b/plugins/base/base-test-utils/api/base-test-utils.api
index 5d5b6db20e..a0b535f2f7 100644
--- a/plugins/base/base-test-utils/api/base-test-utils.api
+++ b/plugins/base/base-test-utils/api/base-test-utils.api
@@ -66,6 +66,7 @@ public final class renderers/RawTestPage : org/jetbrains/dokka/pages/RootPageNod
 	public synthetic fun <init> (Lorg/jetbrains/dokka/pages/ContentNode;Ljava/lang/String;Ljava/util/Set;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun getChildren ()Ljava/util/List;
 	public fun getContent ()Lorg/jetbrains/dokka/pages/ContentNode;
+	public fun getDocumentable ()Lorg/jetbrains/dokka/model/Documentable;
 	public fun getDri ()Ljava/util/Set;
 	public fun getEmbeddedResources ()Ljava/util/List;
 	public fun getName ()Ljava/lang/String;

From 03aea583086777b9b316b2af31d1325d27be454b Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Mon, 21 Feb 2022 18:32:16 +0300
Subject: [PATCH 16/17] Refactor

---
 .../translators/documentables/DefaultPageCreator.kt  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index c5029ca610..3b3121e4e5 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -35,7 +35,7 @@ open class DefaultPageCreator(
 ) {
     protected open val contentBuilder = PageContentBuilder(commentsToContentConverter, signatureProvider, logger)
 
-    protected val mergeNoExpectActualDeclarations =
+    protected val mergeImplicitExpectActualDeclarations =
         configuration?.mergeImplicitExpectActualDeclarations ?: DokkaBaseConfiguration.mergeImplicitExpectActualDeclarationsDefault
 
     protected val separateInheritedMembers =
@@ -46,7 +46,7 @@ open class DefaultPageCreator(
 
     open fun pageForPackage(p: DPackage): PackagePageNode = PackagePageNode(
         p.name, contentForPackage(p), setOf(p.dri), listOf(p),
-        if (mergeNoExpectActualDeclarations)
+        if (mergeImplicitExpectActualDeclarations)
             p.classlikes.mergeClashingDocumentable().map(::pageForClasslikes) +
                     p.functions.mergeClashingDocumentable().map(::pageForFunctions) +
                     p.properties.mergeClashingDocumentable().map(::pageForProperties)
@@ -71,7 +71,7 @@ open class DefaultPageCreator(
         val functions = documentables.flatMap { it.filteredFunctions }
         val props = documentables.flatMap { it.filteredProperties }
 
-        val childrenPages =  if (mergeNoExpectActualDeclarations)
+        val childrenPages =  if (mergeImplicitExpectActualDeclarations)
                             functions.mergeClashingDocumentable().map(::pageForFunctions) +
                             props.mergeClashingDocumentable().map(::pageForProperties)
                 else
@@ -100,7 +100,7 @@ open class DefaultPageCreator(
         val entries = documentables.flatMap { if (it is DEnum) it.entries else emptyList() }
 
         val childrenPages = constructors.map(::pageForFunction) +
-                if (mergeNoExpectActualDeclarations)
+                if (mergeImplicitExpectActualDeclarations)
                     classlikes.mergeClashingDocumentable().map(::pageForClasslikes) +
                             functions.mergeClashingDocumentable().map(::pageForFunctions) +
                             props.mergeClashingDocumentable().map(::pageForProperties) +
@@ -847,12 +847,12 @@ open class DefaultPageCreator(
 
     private val Documentable.groupedTags: GroupedTags
         get() = documentation.flatMap { (pd, doc) ->
-            doc.children.asSequence().map { pd to it }.toList()
+            doc.children.map { pd to it }.toList()
         }.groupBy { it.second::class }
 
     private val List<Documentable>.groupedTags: GroupedTags
         get() = this.flatMap { it.documentation.flatMap { (pd, doc) ->
-            doc.children.asSequence().map { pd to it }.toList()
+            doc.children.map { pd to it }.toList()
         } }.groupBy { it.second::class }
 
     private val Documentable.descriptions: SourceSetDependent<Description>

From 24238a1d81acd8a6647d692505c7b1fe284df8e6 Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Mon, 21 Feb 2022 18:49:48 +0300
Subject: [PATCH 17/17] Format

---
 plugins/base/api/base.api                     |  2 +-
 .../documentables/DefaultPageCreator.kt       | 84 +++++++++++--------
 2 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/plugins/base/api/base.api b/plugins/base/api/base.api
index 295d00ff57..40ee6813a2 100644
--- a/plugins/base/api/base.api
+++ b/plugins/base/api/base.api
@@ -1368,7 +1368,7 @@ public class org/jetbrains/dokka/base/translators/documentables/DefaultPageCreat
 	protected fun getContentBuilder ()Lorg/jetbrains/dokka/base/translators/documentables/PageContentBuilder;
 	public final fun getCustomTagContentProviders ()Ljava/util/List;
 	public final fun getLogger ()Lorg/jetbrains/dokka/utilities/DokkaLogger;
-	protected final fun getMergeNoExpectActualDeclarations ()Z
+	protected final fun getMergeImplicitExpectActualDeclarations ()Z
 	protected final fun getSeparateInheritedMembers ()Z
 	public fun pageForClasslike (Lorg/jetbrains/dokka/model/DClasslike;)Lorg/jetbrains/dokka/pages/ClasslikePageNode;
 	public fun pageForClasslikes (Ljava/util/List;)Lorg/jetbrains/dokka/pages/ClasslikePageNode;
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index 3b3121e4e5..c5136c27ca 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -36,7 +36,8 @@ open class DefaultPageCreator(
     protected open val contentBuilder = PageContentBuilder(commentsToContentConverter, signatureProvider, logger)
 
     protected val mergeImplicitExpectActualDeclarations =
-        configuration?.mergeImplicitExpectActualDeclarations ?: DokkaBaseConfiguration.mergeImplicitExpectActualDeclarationsDefault
+        configuration?.mergeImplicitExpectActualDeclarations
+            ?: DokkaBaseConfiguration.mergeImplicitExpectActualDeclarationsDefault
 
     protected val separateInheritedMembers =
         configuration?.separateInheritedMembers ?: DokkaBaseConfiguration.separateInheritedMembersDefault
@@ -71,13 +72,13 @@ open class DefaultPageCreator(
         val functions = documentables.flatMap { it.filteredFunctions }
         val props = documentables.flatMap { it.filteredProperties }
 
-        val childrenPages =  if (mergeImplicitExpectActualDeclarations)
-                            functions.mergeClashingDocumentable().map(::pageForFunctions) +
-                            props.mergeClashingDocumentable().map(::pageForProperties)
-                else
-                    classlikes.renameClashingDocumentable().map(::pageForClasslike) +
-                            functions.renameClashingDocumentable().map(::pageForFunction) +
-                            props.renameClashingDocumentable().mapNotNull(::pageForProperty)
+        val childrenPages = if (mergeImplicitExpectActualDeclarations)
+            functions.mergeClashingDocumentable().map(::pageForFunctions) +
+                    props.mergeClashingDocumentable().map(::pageForProperties)
+        else
+            classlikes.renameClashingDocumentable().map(::pageForClasslike) +
+                    functions.renameClashingDocumentable().map(::pageForFunction) +
+                    props.renameClashingDocumentable().mapNotNull(::pageForProperty)
 
         return ClasslikePageNode(
             documentables.first().nameAfterClash(), contentForClasslikesAndEntries(documentables), dri, documentables,
@@ -129,7 +130,7 @@ open class DefaultPageCreator(
         }
 
     @Suppress("UNCHECKED_CAST")
-    private fun <T : Documentable>  T.renameClashingDocumentable():T? = when (this) {
+    private fun <T : Documentable> T.renameClashingDocumentable(): T? = when (this) {
         is DClass -> copy(extra = this.extra + DriClashAwareName(this.toClashedName()))
         is DObject -> copy(extra = this.extra + DriClashAwareName(this.toClashedName()))
         is DAnnotation -> copy(extra = this.extra + DriClashAwareName(this.toClashedName()))
@@ -144,12 +145,15 @@ open class DefaultPageCreator(
     private fun <T : Documentable> List<T>.mergeClashingDocumentable(): List<List<T>> =
         groupBy { it.dri }.values.toList()
 
-    open fun pageForFunction(f: DFunction) = MemberPageNode(f.nameAfterClash(), contentForFunction(f), setOf(f.dri), listOf(f))
+    open fun pageForFunction(f: DFunction) =
+        MemberPageNode(f.nameAfterClash(), contentForFunction(f), setOf(f.dri), listOf(f))
 
     open fun pageForFunctions(fs: List<DFunction>): MemberPageNode {
-        val dri = fs.dri.also { if (it.size != 1) {
-            logger.error("Function dri should have the same one ${it.first()} inside the one page!")
-        } }
+        val dri = fs.dri.also {
+            if (it.size != 1) {
+                logger.error("Function dri should have the same one ${it.first()} inside the one page!")
+            }
+        }
         return MemberPageNode(fs.first().nameAfterClash(), contentForMembers(fs), dri, fs)
     }
 
@@ -157,10 +161,12 @@ open class DefaultPageCreator(
         MemberPageNode(p.nameAfterClash(), contentForProperty(p), setOf(p.dri), listOf(p))
 
     open fun pageForProperties(ps: List<DProperty>): MemberPageNode {
-        val dri = ps.dri.also { if (it.size != 1) {
-            logger.error("Property dri should have the same one ${it.first()} inside the one page!")
-        } }
-       return MemberPageNode(ps.first().nameAfterClash(), contentForMembers(ps), dri, ps)
+        val dri = ps.dri.also {
+            if (it.size != 1) {
+                logger.error("Property dri should have the same one ${it.first()} inside the one page!")
+            }
+        }
+        return MemberPageNode(ps.first().nameAfterClash(), contentForMembers(ps), dri, ps)
     }
 
     private fun <T> T.isInherited(): Boolean where T : Documentable, T : WithExtraProperties<T> =
@@ -241,10 +247,11 @@ open class DefaultPageCreator(
     ): ContentGroup {
         val types = scopes.flatMap { it.classlikes } + scopes.filterIsInstance<DPackage>().flatMap { it.typealiases }
         val inheritors = scopes.fold(mutableMapOf<DokkaSourceSet, List<DRI>>()) { acc, scope ->
-            val inheritorsForScope = scope.safeAs<WithExtraProperties<Documentable>>()?.let { it.extra[InheritorsInfo] }?.let { inheritors ->
-                inheritors.value.filter { it.value.isNotEmpty() }
-            }.orEmpty()
-            inheritorsForScope.forEach { (k,v) ->
+            val inheritorsForScope =
+                scope.safeAs<WithExtraProperties<Documentable>>()?.let { it.extra[InheritorsInfo] }?.let { inheritors ->
+                    inheritors.value.filter { it.value.isNotEmpty() }
+                }.orEmpty()
+            inheritorsForScope.forEach { (k, v) ->
                 acc.compute(k) { _, value -> value?.plus(v) ?: v }
             }
             acc
@@ -270,11 +277,12 @@ open class DefaultPageCreator(
             s.classlikes,
             (s as? DPackage)?.typealiases ?: emptyList()
         ).flatten()
-        val inheritors = s.safeAs<WithExtraProperties<Documentable>>()?.let { it.extra[InheritorsInfo] }?.let { inheritors ->
-           inheritors.value.filter { it.value.isNotEmpty() }
-        }.orEmpty()
+        val inheritors =
+            s.safeAs<WithExtraProperties<Documentable>>()?.let { it.extra[InheritorsInfo] }?.let { inheritors ->
+                inheritors.value.filter { it.value.isNotEmpty() }
+            }.orEmpty()
 
-       return contentForScope(setOf(dri), sourceSets, types, s.functions, s.properties, inheritors)
+        return contentForScope(setOf(dri), sourceSets, types, s.functions, s.properties, inheritors)
     }
 
     protected open fun contentForScope(
@@ -361,7 +369,8 @@ open class DefaultPageCreator(
                         "Constructors",
                         2,
                         ContentKind.Constructors,
-                        constructorsToDocumented.groupBy { it.parameters.map { it.dri }  }.map { (_,v) -> v.first().name to v },
+                        constructorsToDocumented.groupBy { it.parameters.map { it.dri } }
+                            .map { (_, v) -> v.first().name to v },
                         @Suppress("UNCHECKED_CAST")
                         (csWithConstructor as List<Documentable>).sourceSets,
                         needsAnchors = true,
@@ -456,7 +465,7 @@ open class DefaultPageCreator(
             if (customTags.isNotEmpty()) {
                 group(styles = setOf(TextStyle.Block)) {
                     platforms.forEach { platform ->
-                        customTags.forEach { (tagName, sourceSetTag) ->
+                        customTags.forEach { (_, sourceSetTag) ->
                             sourceSetTag[platform]?.let { tag ->
                                 customTagContentProviders.filter { it.isApplicable(tag) }.forEach { provider ->
                                     with(provider) {
@@ -677,7 +686,8 @@ open class DefaultPageCreator(
 
                     We purposefully ignore all other tags as they should not be visible in brief
                  */
-                it.firstMemberOfTypeOrNull<Description>() ?: it.firstMemberOfTypeOrNull<Property>().takeIf { documentable is DProperty }
+                it.firstMemberOfTypeOrNull<Description>() ?: it.firstMemberOfTypeOrNull<Property>()
+                    .takeIf { documentable is DProperty }
             }?.let {
                 group(sourceSets = setOf(sourceSet), kind = ContentKind.BriefComment) {
                     if (documentable.hasSeparatePage) createBriefComment(documentable, sourceSet, it)
@@ -687,9 +697,13 @@ open class DefaultPageCreator(
         }
     }
 
-    private fun DocumentableContentBuilder.createBriefComment(documentable: Documentable, sourceSet: DokkaSourceSet, tag: TagWrapper){
+    private fun DocumentableContentBuilder.createBriefComment(
+        documentable: Documentable,
+        sourceSet: DokkaSourceSet,
+        tag: TagWrapper
+    ) {
         (documentable as? WithSources)?.documentableLanguage(sourceSet)?.let {
-            when(it){
+            when (it) {
                 DocumentableLanguage.KOTLIN -> firstParagraphComment(tag.root)
                 DocumentableLanguage.JAVA -> firstSentenceComment(tag.root)
             }
@@ -825,7 +839,7 @@ open class DefaultPageCreator(
         if (customTags.isEmpty()) return
 
         documentable.sourceSets.forEach { sourceSet ->
-            customTags.forEach { (tagName, sourceSetTag) ->
+            customTags.forEach { (_, sourceSetTag) ->
                 sourceSetTag[sourceSet]?.let { tag ->
                     customTagContentProviders.filter { it.isApplicable(tag) }.forEach { provider ->
                         with(provider) {
@@ -851,9 +865,11 @@ open class DefaultPageCreator(
         }.groupBy { it.second::class }
 
     private val List<Documentable>.groupedTags: GroupedTags
-        get() = this.flatMap { it.documentation.flatMap { (pd, doc) ->
-            doc.children.map { pd to it }.toList()
-        } }.groupBy { it.second::class }
+        get() = this.flatMap {
+            it.documentation.flatMap { (pd, doc) ->
+                doc.children.map { pd to it }.toList()
+            }
+        }.groupBy { it.second::class }
 
     private val Documentable.descriptions: SourceSetDependent<Description>
         get() = groupedTags.withTypeUnnamed()