From dcd4c1c5bc13e7bb058bcd055aa2b02d7d39e9c1 Mon Sep 17 00:00:00 2001
From: Andrzej Ratajczak <andrzej.ratajczak98@gmail.com>
Date: Tue, 14 Jul 2020 19:22:17 +0200
Subject: Fix presenting inline code in KDoc

---
 .../pages/comments/DocTagToContentConverter.kt            | 15 ++++++++++++---
 .../transformers/pages/samples/SamplesTransformer.kt      |  7 ++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

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

diff --git a/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt b/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt
index 1770dc6f..19817992 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt
@@ -91,7 +91,7 @@ object DocTagToContentConverter : CommentsToContentConverter {
                 )
             )
             is BlockQuote -> listOf(
-                ContentCode(
+                ContentCodeBlock(
                     buildChildren(docTag),
                     "",
                     dci,
@@ -99,8 +99,17 @@ object DocTagToContentConverter : CommentsToContentConverter {
                     styles
                 )
             )
-            is Code -> listOf(
-                ContentCode(
+            is CodeInline -> listOf(
+                ContentCodeInline(
+                    buildChildren(docTag),
+                    "",
+                    dci,
+                    sourceSets,
+                    styles
+                )
+            )
+            is CodeBlock -> listOf(
+                ContentCodeBlock(
                     buildChildren(docTag),
                     "",
                     dci,
diff --git a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
index 41dea1a2..695ef050 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
@@ -86,7 +86,7 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer {
             |   //sampleEnd
             |}""".trimMargin()
 
-    private fun ContentNode.dfs(fqName: String, node: ContentCode): ContentNode {
+    private fun ContentNode.dfs(fqName: String, node: ContentCodeBlock): ContentNode {
         return when (this) {
             is ContentHeader -> copy(children.map { it.dfs(fqName, node) })
             is ContentDivergentGroup -> @Suppress("UNCHECKED_CAST") copy(children.map {
@@ -96,7 +96,8 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer {
                 before.let { it?.dfs(fqName, node) },
                 divergent.dfs(fqName, node),
                 after.let { it?.dfs(fqName, node) })
-            is ContentCode -> copy(children.map { it.dfs(fqName, node) })
+            is ContentCodeBlock -> copy(children.map { it.dfs(fqName, node) })
+            is ContentCodeInline -> copy(children.map { it.dfs(fqName, node) })
             is ContentDRILink -> copy(children.map { it.dfs(fqName, node) })
             is ContentResolvedLink -> copy(children.map { it.dfs(fqName, node) })
             is ContentEmbeddedResource -> copy(children.map { it.dfs(fqName, node) })
@@ -131,7 +132,7 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer {
         styles: Set<Style> = emptySet(),
         extra: PropertyContainer<ContentNode> = PropertyContainer.empty()
     ) =
-        ContentCode(
+        ContentCodeBlock(
             children = listOf(
                 ContentText(
                     text = content,
-- 
cgit