Add option to merge implicit expect-actual declarations (#2316)

* Add option to merge implicit expect-actual declarations

* Merge entries, constructors

* Fix StdLib integration test

* Add doc

1 files changed, 4 insertions, 4 deletions

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 2fb70fc8..6c12c719 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)
@@ -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())
+                            )
                     )
                 }
             }