From e9d7fc75b46bb44f2c946b8cbb0636deb71e20dc Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Tue, 19 May 2020 11:02:11 +0200
Subject: Fix params rendering in table

---
 plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt    |  9 +++++++--
 .../kotlin/translators/documentables/DefaultPageCreator.kt     | 10 +++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'plugins/base/src/main/kotlin')

diff --git a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
index d61c50b5..dd293e54 100644
--- a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
+++ b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
@@ -196,9 +196,14 @@ open class HtmlRenderer(
 
                     it.filter { it !is ContentLink }.takeIf { it.isNotEmpty() }?.let {
                         div("platform-dependent-row keyValue") {
-                            div()
+                            val title = it.filter { it.style.contains(ContentStyle.RowTitle) }
+                            div {
+                                title.forEach {
+                                    it.build(this, pageContext, sourceSetRestriction)
+                                }
+                            }
                             div("title") {
-                                it.forEach {
+                                (it - title).forEach {
                                     it.build(this, pageContext, sourceSetRestriction)
                                 }
                             }
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index 4252de3b..296b0de6 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -220,16 +220,16 @@ open class DefaultPageCreator(
                 table(kind = ContentKind.Parameters) {
                     platforms.flatMap { platform ->
                         val receiverRow = receiver[platform]?.let {
-                            buildGroup(sourceSets = setOf(platform), kind = ContentKind.Parameters, styles = mainStyles + ContentStyle.KeyValue) {
-                                text("<receiver>")
+                            buildGroup(sourceSets = setOf(platform), kind = ContentKind.Parameters) {
+                                text("<receiver>", styles = mainStyles + ContentStyle.RowTitle)
                                 comment(it.root)
                             }
                         }
 
                         val paramRows = params.mapNotNull { (_, param) ->
                             param[platform]?.let {
-                                buildGroup(sourceSets = setOf(platform), kind = ContentKind.Parameters, styles = mainStyles + ContentStyle.KeyValue) {
-                                    text(it.name, kind = ContentKind.Parameters)
+                                buildGroup(sourceSets = setOf(platform), kind = ContentKind.Parameters) {
+                                    text(it.name, kind = ContentKind.Parameters, styles = mainStyles + ContentStyle.RowTitle)
                                     comment(it.root)
                                 }
                             }
@@ -251,7 +251,7 @@ open class DefaultPageCreator(
                     platforms.flatMap { platform ->
                         seeAlsoTags.mapNotNull { (_, see) ->
                             see[platform]?.let {
-                                buildGroup(sourceSets = setOf(platform), kind = ContentKind.Comment, styles = mainStyles + ContentStyle.KeyValue) {
+                                buildGroup(sourceSets = setOf(platform), kind = ContentKind.Comment, styles = mainStyles + ContentStyle.RowTitle) {
                                     if (it.address != null) link(it.name, it.address!!, kind = ContentKind.Comment)
                                     else text(it.name, kind = ContentKind.Comment)
                                     comment(it.root)
-- 
cgit