From 18bada290ab8ebdbf6f5e43d9c3415dd5225227d Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Wed, 11 Mar 2020 22:01:04 +0100
Subject: Fix nested monospace spans in signature

---
 .../src/main/kotlin/renderers/html/HtmlRenderer.kt    |  1 -
 .../main/kotlin/signatures/KotlinSignatureProvider.kt |  2 +-
 .../translators/documentables/DefaultPageCreator.kt   | 19 +++++++------------
 3 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'plugins/base')

diff --git a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
index e687999b..d7b2a912 100644
--- a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
+++ b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
@@ -34,7 +34,6 @@ open class HtmlRenderer(
             node.dci.kind == ContentKind.BriefComment -> div("brief $additionalClasses") { childrenCallback() }
             node.style.contains(TextStyle.Paragraph) -> p(additionalClasses) { childrenCallback() }
             node.style.contains(TextStyle.Block) -> div(additionalClasses) { childrenCallback() }
-            additionalClasses.isNotBlank() -> span(additionalClasses) { childrenCallback() }
             else -> childrenCallback()
         }
     }
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
index 98394872..79a398cc 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
@@ -77,7 +77,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
         }
     }
 
-    private fun signature(t: TypeParameter) = contentBuilder.contentFor(t, ContentKind.Main) {
+    private fun signature(t: TypeParameter) = contentBuilder.contentFor(t) {
         link(t.name, t.dri)
         list(t.bounds, prefix = " : ") {
             signatureForProjection(it)
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index 401802eb..79f876bf 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -61,9 +61,7 @@ open class DefaultPageCreator(
         block("Types", 2, ContentKind.Classlikes, s.classlikes, platformData.toSet()) {
             link(it.name.orEmpty(), it.dri)
             group {
-                group(kind = ContentKind.Symbol) {
-                    +buildSignature(it)
-                }
+                +buildSignature(it)
                 group(kind = ContentKind.BriefComment) {
                     text(it.briefDocumentation())
                 }
@@ -72,9 +70,8 @@ open class DefaultPageCreator(
         block("Functions", 2, ContentKind.Functions, s.functions, platformData.toSet()) {
             link(it.name, it.dri)
             group {
-                group(kind = ContentKind.Symbol) {
-                    +buildSignature(it)
-                }
+                +buildSignature(it)
+
                 group(kind = ContentKind.BriefComment) {
                     text(it.briefDocumentation())
                 }
@@ -91,18 +88,16 @@ open class DefaultPageCreator(
 
     protected open fun contentForClasslike(c: Classlike) = contentBuilder.contentFor(c) {
         header(1) { text(c.name.orEmpty()) }
-        group(kind = ContentKind.Symbol) {
-            +buildSignature(c)
-        }
+        +buildSignature(c)
+
         +contentForComments(c) { it !is Property }
 
         if (c is WithConstructors) {
             block("Constructors", 2, ContentKind.Constructors, c.constructors, c.platformData.toSet()) {
                 link(it.name, it.dri)
                 group {
-                    group(kind = ContentKind.Symbol) {
-                        +buildSignature(it)
-                    }
+                    +buildSignature(it)
+
                     group(kind = ContentKind.BriefComment) {
                         text(it.briefDocumentation())
                     }
-- 
cgit