diff options
Diffstat (limited to 'plugins/base/src/main/kotlin/translators')
| -rw-r--r-- | plugins/base/src/main/kotlin/translators/psi/parsers/JavadocParser.kt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/base/src/main/kotlin/translators/psi/parsers/JavadocParser.kt b/plugins/base/src/main/kotlin/translators/psi/parsers/JavadocParser.kt index 8bc950b7..6de3e0e0 100644 --- a/plugins/base/src/main/kotlin/translators/psi/parsers/JavadocParser.kt +++ b/plugins/base/src/main/kotlin/translators/psi/parsers/JavadocParser.kt @@ -312,9 +312,8 @@ class JavadocParser( } private fun PsiElement.toDocumentationLinkString( - labelElement: List<PsiElement>? = null + label: String = "" ): String { - val label = labelElement?.toList().takeUnless { it.isNullOrEmpty() } ?: listOf(defaultLabel()) val dri = reference?.resolve()?.takeIf { it !is PsiParameter }?.let { val dri = DRI.from(it) @@ -322,7 +321,7 @@ class JavadocParser( dri.toString() } ?: UNRESOLVED_PSI_ELEMENT - return """<a data-dri="$dri">${label.joinToString(" ") { it.text }}</a>""" + return """<a data-dri="$dri">${label.ifBlank{ defaultLabel().text }}</a>""" } private fun convertInlineDocTag( @@ -332,7 +331,9 @@ class JavadocParser( ) = when (tag.name) { "link", "linkplain" -> tag.referenceElement() - ?.toDocumentationLinkString(tag.dataElements.filterIsInstance<PsiDocToken>()) + ?.toDocumentationLinkString(tag.dataElements.filterIsInstance<PsiDocToken>().joinToString("") { + it.stringifyElementAsText(keepFormatting = true).orEmpty() + }) "code" -> "<code data-inline>${dataElementsAsText(tag)}</code>" "literal" -> "<literal>${dataElementsAsText(tag)}</literal>" "index" -> "<index>${tag.children.filterIsInstance<PsiDocTagValue>().joinToString { it.text }}</index>" @@ -345,7 +346,7 @@ class JavadocParser( private fun dataElementsAsText(tag: PsiInlineDocTag) = tag.dataElements.joinToString("") { - it.stringifyElementAsText(keepFormatting = true).toString() + it.stringifyElementAsText(keepFormatting = true).orEmpty() }.htmlEscape() private fun createLink(element: Element, children: List<DocTag>): DocTag { |