From 0e38d64aa84a90668f6e0e4e346e447f2349aa54 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Tue, 25 Aug 2020 11:47:50 +0200 Subject: Fix presentation of code blocks in dokka html and dokka javadoc formats --- plugins/base/src/main/kotlin/translators/psi/JavadocParser.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'plugins/base/src/main/kotlin/translators') diff --git a/plugins/base/src/main/kotlin/translators/psi/JavadocParser.kt b/plugins/base/src/main/kotlin/translators/psi/JavadocParser.kt index b9c328dc..5baaf35a 100644 --- a/plugins/base/src/main/kotlin/translators/psi/JavadocParser.kt +++ b/plugins/base/src/main/kotlin/translators/psi/JavadocParser.kt @@ -151,7 +151,8 @@ class JavadocParser( is PsiInlineDocTag -> convertInlineDocTag(this) is PsiDocParamRef -> toDocumentationLinkString() is PsiDocTagValue, - is LeafPsiElement -> text + is LeafPsiElement -> (if ((prevSibling as? PsiDocToken)?.isLeadingAsterisk() == true) text?.drop(1) else text) + ?.takeUnless { it.isBlank() } else -> null } @@ -214,7 +215,7 @@ class JavadocParser( } private fun convertHtmlNode(node: Node, insidePre: Boolean = false): DocTag? = when (node) { - is TextNode -> Text(body = if (insidePre) node.wholeText else node.text()) + is TextNode -> (if (insidePre) node.wholeText else node.text().takeIf { it.isNotBlank() })?.let { Text(body = it) } is Element -> createBlock(node) else -> null } -- cgit