Iterate over documentable sourcesets when building custom tags

Kotlin · Feb 14, 2022 · b0a5811 · b0a5811
1 parent dc75298
commit b0a5811
Showing 1 changed file with 18 additions and 10 deletions.
diff --git 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)
+                                                                }
+                                                            }
                                                         }
                                                     }
                                                 }