From b2b542988d1523749ab3a881e3cd4cf502ccdd6d Mon Sep 17 00:00:00 2001 From: Marcin Aman Date: Wed, 28 Jul 2021 18:23:50 +0200 Subject: Fix broken link in kotlinx.serialization (#2038) * Fix broken link in kotlinx.serialization * Rename DRIWithSourceSet to DRIWithSourceSets --- .../transformers/pages/merger/SameMethodNamePageMergerStrategy.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'plugins/base/src/main/kotlin/transformers/pages') 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 4eacf359..2fb70fc8 100644 --- a/plugins/base/src/main/kotlin/transformers/pages/merger/SameMethodNamePageMergerStrategy.kt +++ b/plugins/base/src/main/kotlin/transformers/pages/merger/SameMethodNamePageMergerStrategy.kt @@ -1,5 +1,7 @@ package org.jetbrains.dokka.base.transformers.pages.merger +import org.jetbrains.dokka.base.renderers.sourceSets +import org.jetbrains.dokka.model.DisplaySourceSet import org.jetbrains.dokka.model.dfs import org.jetbrains.dokka.pages.* import org.jetbrains.dokka.utilities.DokkaLogger @@ -19,7 +21,7 @@ class SameMethodNamePageMergerStrategy(val logger: DokkaLogger) : PageMergerStra dri = dri, name = name, children = members.flatMap { it.children }.distinct(), - content = squashDivergentInstances(members), + content = squashDivergentInstances(members).withSourceSets(members.allSourceSets()), embeddedResources = members.flatMap { it.embeddedResources }.distinct(), documentable = null ) @@ -27,6 +29,9 @@ class SameMethodNamePageMergerStrategy(val logger: DokkaLogger) : PageMergerStra return (pages - members) + listOf(merged) } + private fun List.allSourceSets(): Set = + fold(emptySet()) { acc, e -> acc + e.sourceSets() } + private fun squashDivergentInstances(nodes: List): ContentNode = nodes.map { it.content } .reduce { acc, node -> -- cgit