From 8a221a9084bf4fbc79b514c7f113fa2c4cb3dcfd Mon Sep 17 00:00:00 2001 From: Filip ZybaƂa Date: Tue, 23 Jun 2020 13:52:20 +0200 Subject: Platform restriction handling for platform-hinted content --- plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt | 9 ++++++--- plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt | 10 ++++++++-- plugins/base/src/main/resources/dokka/styles/style.css | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'plugins/base/src/main') diff --git a/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt b/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt index 1684f819..141a18e6 100644 --- a/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt +++ b/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt @@ -45,8 +45,11 @@ abstract class DefaultRenderer( abstract fun buildPage(page: ContentPage, content: (T, ContentPage) -> Unit): String abstract fun buildError(node: ContentNode) - open fun T.buildPlatformDependent(content: PlatformHintedContent, pageContext: ContentPage) = - buildContentNode(content.inner, pageContext) + open fun T.buildPlatformDependent( + content: PlatformHintedContent, + pageContext: ContentPage, + sourceSetRestriction: Set? + ) = buildContentNode(content.inner, pageContext) open fun T.buildGroup( node: ContentGroup, @@ -110,7 +113,7 @@ abstract class DefaultRenderer( is ContentTable -> buildTable(node, pageContext, sourceSetRestriction) is ContentGroup -> buildGroup(node, pageContext, sourceSetRestriction) is ContentBreakLine -> buildNewLine() - is PlatformHintedContent -> buildPlatformDependent(node, pageContext) + is PlatformHintedContent -> buildPlatformDependent(node, pageContext, sourceSetRestriction) is ContentDivergentGroup -> buildDivergent(node, pageContext) else -> buildError(node) } diff --git a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt index 8104d399..43722888 100644 --- a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt +++ b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt @@ -135,9 +135,15 @@ open class HtmlRenderer( } } - override fun FlowContent.buildPlatformDependent(content: PlatformHintedContent, pageContext: ContentPage) = + override fun FlowContent.buildPlatformDependent( + content: PlatformHintedContent, + pageContext: ContentPage, + sourceSetRestriction: Set? + ) = buildPlatformDependent( - content.sourceSets.map { it to setOf(content.inner) }.toMap(), + content.sourceSets.filter { + sourceSetRestriction == null || it in sourceSetRestriction + }.map { it to setOf(content.inner) }.toMap(), pageContext, content.extra, content.style diff --git a/plugins/base/src/main/resources/dokka/styles/style.css b/plugins/base/src/main/resources/dokka/styles/style.css index f0f2d31a..0d1314c9 100644 --- a/plugins/base/src/main/resources/dokka/styles/style.css +++ b/plugins/base/src/main/resources/dokka/styles/style.css @@ -143,6 +143,7 @@ .divergent-group .table-row { background-color: #F4F4F4; + border-bottom: 2px solid white; } .title > .divergent-group:first-of-type { -- cgit