From e6dd88c0cce8d61aeed19b4f49c7cca3d95b72b1 Mon Sep 17 00:00:00 2001 From: Marcin Aman Date: Mon, 20 Sep 2021 11:35:26 +0200 Subject: Make see tag display as other tables (#2153) --- .../main/kotlin/translators/documentables/DefaultPageCreator.kt | 2 +- .../base/src/main/kotlin/translators/psi/parsers/JavadocParser.kt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'plugins/base/src/main') diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt index 548ca08e..300e0926 100644 --- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt +++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt @@ -422,7 +422,7 @@ open class DefaultPageCreator( row( sourceSets = setOf(platform), kind = ContentKind.Comment, - styles = this@sourceSetDependentHint.mainStyles + ContentStyle.RowTitle, + styles = this@sourceSetDependentHint.mainStyles, ) { if (it.address != null) link( it.name, 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 6de3e0e0..b7e60cee 100644 --- a/plugins/base/src/main/kotlin/translators/psi/parsers/JavadocParser.kt +++ b/plugins/base/src/main/kotlin/translators/psi/parsers/JavadocParser.kt @@ -139,7 +139,7 @@ class JavadocParser( ) // Workaround: PSI returns first word after @author tag as a `DOC_TAG_VALUE_ELEMENT`, then the rest as a `DOC_COMMENT_DATA`, so for `Name Surname` we get them parted JavadocTag.SEE -> { val name = - tag.resolveToElement()?.getKotlinFqName()?.asString() ?: tag.referenceElement()?.text.orEmpty() + tag.resolveToElement()?.getKotlinFqName()?.asString() ?: tag.referenceElement()?.text.orEmpty().removePrefix("#") getSeeTagElementContent(tag, resolutionContext.copy(name = name)).let { See( wrapTagIfNecessary(it.first), @@ -179,9 +179,10 @@ class JavadocParser( tag: PsiDocTag, context: CommentResolutionContext ): Pair, DRI?> { - val linkElement = tag.referenceElement()?.toDocumentationLink(context = context) + val referenceElement = tag.referenceElement() + val linkElement = referenceElement?.toDocumentationLink(context = context) val content = convertJavadocElements( - tag.dataElements.dropWhile { it is PsiWhiteSpace || (it as? LazyParseablePsiElement)?.tokenType == JavaDocElementType.DOC_REFERENCE_HOLDER }, + tag.dataElements.dropWhile { it is PsiWhiteSpace || (it as? LazyParseablePsiElement)?.tokenType == JavaDocElementType.DOC_REFERENCE_HOLDER || it == referenceElement }, context = context ) return Pair(content, linkElement?.dri) -- cgit