aboutsummaryrefslogtreecommitdiff
path: root/plugins/base/src/main/kotlin/transformers/pages
diff options
context:
space:
mode:
authorMarcin Aman <marcin.aman@gmail.com>2021-04-14 15:15:48 +0200
committerGitHub <noreply@github.com>2021-04-14 15:15:48 +0200
commitd0f83037a12441145d35090461ef3c91df4c4076 (patch)
treeace7e41d4048a848179409b648cf88a32659cae4 /plugins/base/src/main/kotlin/transformers/pages
parentf27be3dfd3fa264f946161611638ad260a0ff392 (diff)
downloaddokka-d0f83037a12441145d35090461ef3c91df4c4076.tar.gz
dokka-d0f83037a12441145d35090461ef3c91df4c4076.tar.bz2
dokka-d0f83037a12441145d35090461ef3c91df4c4076.zip
Handle html in kdoc (#1805)
Diffstat (limited to 'plugins/base/src/main/kotlin/transformers/pages')
-rw-r--r--plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt5
1 files changed, 3 insertions, 2 deletions
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 a3a9ad6a..a02f1b53 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt
@@ -7,6 +7,7 @@ import org.jetbrains.dokka.model.properties.PropertyContainer
import org.jetbrains.dokka.model.toDisplaySourceSets
import org.jetbrains.dokka.pages.*
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
+import org.jetbrains.dokka.model.properties.plus
open class DocTagToContentConverter : CommentsToContentConverter {
override fun buildContent(
@@ -145,7 +146,8 @@ open class DocTagToContentConverter : CommentsToContentConverter {
docTag.body,
dci,
sourceSets.toDisplaySourceSets(),
- styles
+ styles,
+ extra + HtmlContent.takeIf { docTag.params["content-type"] == "html" }
)
)
is Strikethrough -> buildChildren(docTag, setOf(TextStyle.Strikethrough))
@@ -204,7 +206,6 @@ open class DocTagToContentConverter : CommentsToContentConverter {
styles
)
)
-
is CustomDocTag -> if (docTag.isNonemptyFile()) {
listOf(
ContentGroup(