From 47a145f68b716bf06630fbfc0c191d72062d2937 Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Thu, 16 Jul 2020 12:34:27 +0200 Subject: Fix signature duplication when filtering inherited functions --- .../src/main/kotlin/translators/documentables/DefaultPageCreator.kt | 6 +++--- plugins/base/src/main/resources/dokka/styles/style.css | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'plugins/base') diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt index 5180d4fc..02f4b54e 100644 --- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt +++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt @@ -62,9 +62,9 @@ open class DefaultPageCreator( open fun pageForTypeAlias(t: DTypeAlias) = MemberPageNode(t.name, contentForTypeAlias(t), setOf(t.dri), t) private val WithScope.filteredFunctions: List - get() = functions.flatMap { dFunction -> - dFunction.sourceSets.mapNotNull { sourceSetData -> - dFunction.takeIf { it.extra[InheritedFunction]?.isInherited(sourceSetData) != true } + get() = functions.mapNotNull { function -> + function.takeIf { + it.sourceSets.any { sourceSet -> it.extra[InheritedFunction]?.isInherited(sourceSet) != true } } } diff --git a/plugins/base/src/main/resources/dokka/styles/style.css b/plugins/base/src/main/resources/dokka/styles/style.css index b5c11317..7e33c6bb 100644 --- a/plugins/base/src/main/resources/dokka/styles/style.css +++ b/plugins/base/src/main/resources/dokka/styles/style.css @@ -834,7 +834,6 @@ td.content { .inner-brief-with-platform-tags { display: inline-block; - width: 100%; } .tabs-section-body .brief-with-platform-tags { -- cgit