diff options
Diffstat (limited to 'core/src/main/kotlin/Model')
| -rw-r--r-- | core/src/main/kotlin/Model/DocumentationNode.kt | 4 | ||||
| -rw-r--r-- | core/src/main/kotlin/Model/transformers/DocumentationNodesMerger.kt | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/src/main/kotlin/Model/DocumentationNode.kt b/core/src/main/kotlin/Model/DocumentationNode.kt index 7efe6818..fc81db6d 100644 --- a/core/src/main/kotlin/Model/DocumentationNode.kt +++ b/core/src/main/kotlin/Model/DocumentationNode.kt @@ -1,6 +1,7 @@ package org.jetbrains.dokka.Model import org.jetbrains.dokka.links.DRI +import org.jetbrains.dokka.pages.PlatformData import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.kdoc.psi.impl.KDocTag @@ -66,7 +67,7 @@ class Descriptor<out T : DeclarationDescriptor>( val descriptor: T, val docTag: KDocTag?, val links: Map<String, DRI>, - val passes: List<String> + val platformData: List<PlatformData> ) : DeclarationDescriptor by descriptor { override fun equals(other: Any?): Boolean = @@ -83,6 +84,7 @@ abstract class DocumentationNode<out T : DeclarationDescriptor> { open val expectDescriptor: Descriptor<T>? = null open val actualDescriptors: List<Descriptor<T>> = emptyList() val descriptors by lazy { listOfNotNull(expectDescriptor) + actualDescriptors } + val platformData by lazy { descriptors.flatMap { it.platformData }.toSet() } abstract val dri: DRI diff --git a/core/src/main/kotlin/Model/transformers/DocumentationNodesMerger.kt b/core/src/main/kotlin/Model/transformers/DocumentationNodesMerger.kt index c5a67513..2fb2f7c0 100644 --- a/core/src/main/kotlin/Model/transformers/DocumentationNodesMerger.kt +++ b/core/src/main/kotlin/Model/transformers/DocumentationNodesMerger.kt @@ -28,7 +28,7 @@ fun <T:DeclarationDescriptor> Descriptor<T>.mergeWith(other: Descriptor<T>?) = D descriptor, docTag, links, - (passes + (other?.passes ?: emptyList())).distinct() + (platformData + (other?.platformData ?: emptyList())).distinct() ) fun <T:DeclarationDescriptor> List<Descriptor<T>>.merge() : List<Descriptor<T>> = |
