From fb589740213286cc5c2f240f248a10752187a9d7 Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Wed, 22 Jun 2022 17:14:58 +0200 Subject: Render annotations for KaJ signatures (#2549) Fixes #2527 --- .../src/main/kotlin/signatures/JavaSignatureProvider.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'plugins/kotlin-as-java/src/main/kotlin') diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt index cff5b182..b21745a9 100644 --- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt +++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt @@ -64,6 +64,7 @@ class JavaSignatureProvider internal constructor(ctcc: CommentsToContentConverte setOf(TextStyle.Monospace) + deprecationStyles, sourceSets = setOf(sourceSet) ) { + annotationsBlock(c) c.visibility[sourceSet]?.takeIf { it !in ignoredVisibilities }?.name?.plus(" ")?.let { keyword(it) } if (c is DClass) { @@ -161,6 +162,7 @@ class JavaSignatureProvider internal constructor(ctcc: CommentsToContentConverte private fun signature(t: DTypeParameter) = t.sourceSets.map { contentBuilder.contentFor(t, styles = t.stylesIfDeprecated(it), sourceSets = setOf(it)) { + annotationsInline(t) text(t.name.substringAfterLast(".")) list(t.bounds, prefix = " extends ", separatorStyles = mainStyles + TokenStyle.Punctuation, @@ -172,9 +174,13 @@ class JavaSignatureProvider internal constructor(ctcc: CommentsToContentConverte } private fun PageContentBuilder.DocumentableContentBuilder.signatureForProjection(p: Projection): Unit = when (p) { - is TypeParameter -> link(p.name, p.dri) + is TypeParameter -> { + annotationsInline(p) + link(p.name, p.dri) + } is TypeConstructor -> group(styles = emptySet()) { + annotationsInline(p) link(p.dri.classNames.orEmpty(), p.dri) list(p.projections, prefix = "<", suffix = ">", separatorStyles = mainStyles + TokenStyle.Punctuation, -- cgit