From def5b63ec4afa69d22f66bf1af76175fc1cdec3f Mon Sep 17 00:00:00 2001 From: Błażej Kardyś Date: Fri, 15 Nov 2019 03:37:27 +0100 Subject: Page generation changes --- core/src/main/kotlin/Model/DocumentationNode.kt | 4 +++- core/src/main/kotlin/Model/transformers/DocumentationNodesMerger.kt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'core/src/main/kotlin/Model') 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( val descriptor: T, val docTag: KDocTag?, val links: Map, - val passes: List + val platformData: List ) : DeclarationDescriptor by descriptor { override fun equals(other: Any?): Boolean = @@ -83,6 +84,7 @@ abstract class DocumentationNode { open val expectDescriptor: Descriptor? = null open val actualDescriptors: List> = 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 Descriptor.mergeWith(other: Descriptor?) = D descriptor, docTag, links, - (passes + (other?.passes ?: emptyList())).distinct() + (platformData + (other?.platformData ?: emptyList())).distinct() ) fun List>.merge() : List> = -- cgit