From b0a58115940dc4cf08cc2f54e6bdc322624388f0 Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Thu, 3 Feb 2022 20:43:34 +0300 Subject: [PATCH] Iterate over documentable sourcesets when building custom tags --- .../documentables/DefaultPageCreator.kt | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt index 0c4f11fd3e..72305b6890 100644 --- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt +++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt @@ -346,11 +346,13 @@ open class DefaultPageCreator( val customTags = d.customTags if (customTags.isNotEmpty()) { group(styles = setOf(TextStyle.Block)) { - customTags.forEach { (tagName, sourceSetDependent) -> - sourceSetDependent.forEach { (sourceSet, tag) -> - customTagContentProviders.forEach { provider -> - with(provider) { - contentForDescription(sourceSet, tag) + platforms.forEach { platform -> + customTags.forEach { (tagName, sourceSetTag) -> + sourceSetTag[platform]?.let { tag -> + customTagContentProviders.forEach { provider -> + with(provider) { + contentForDescription(platform, tag) + } } } } @@ -681,11 +683,17 @@ open class DefaultPageCreator( } after(extra = PropertyContainer.empty()) { contentForBrief(it) - it.customTags.forEach { (tagName, sourceSetDependent) -> - sourceSetDependent.forEach { (sourceSet, tag) -> - customTagContentProviders.forEach { provider -> - with(provider) { - contentForBrief(sourceSet, tag) + + val customTags = it.customTags + if (customTags.isNotEmpty()) { + it.sourceSets.forEach { sourceSet -> + customTags.forEach { (tagName, sourceSetTag) -> + sourceSetTag[sourceSet]?.let { tag -> + customTagContentProviders.forEach { provider -> + with(provider) { + contentForDescription(sourceSet, tag) + } + } } } }