From 94a4edd5ccf43fbdb6ed833761afe659b82d4bf9 Mon Sep 17 00:00:00 2001 From: Andrey Tyrin Date: Tue, 14 Nov 2023 16:35:45 +0100 Subject: Remove empty spans rendering for missed modifiers (#3343) * Remove property modifiers if there are none * Remove variance modifier rendering if it is absent --- .../org/jetbrains/dokka/base/signatures/KotlinSignatureProvider.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dokka-subprojects/plugin-base/src/main') diff --git a/dokka-subprojects/plugin-base/src/main/kotlin/org/jetbrains/dokka/base/signatures/KotlinSignatureProvider.kt b/dokka-subprojects/plugin-base/src/main/kotlin/org/jetbrains/dokka/base/signatures/KotlinSignatureProvider.kt index 2180e776..0fc7ca72 100644 --- a/dokka-subprojects/plugin-base/src/main/kotlin/org/jetbrains/dokka/base/signatures/KotlinSignatureProvider.kt +++ b/dokka-subprojects/plugin-base/src/main/kotlin/org/jetbrains/dokka/base/signatures/KotlinSignatureProvider.kt @@ -248,7 +248,7 @@ public class KotlinSignatureProvider( p.modifier[sourceSet].takeIf { it !in ignoredModifiers }?.let { if (it is JavaModifier.Empty) KotlinModifier.Open else it }?.name?.let { keyword("$it ") } - p.modifiers()[sourceSet]?.toSignatureString()?.let { keyword(it) } + p.modifiers()[sourceSet]?.toSignatureString()?.takeIf { it.isNotEmpty() }?.let { keyword(it) } if (p.isMutable()) keyword("var ") else keyword("val ") list(p.generics, prefix = "<", suffix = "> ", separatorStyles = mainStyles + TokenStyle.Punctuation, @@ -303,7 +303,7 @@ public class KotlinSignatureProvider( f.modifier[sourceSet]?.takeIf { it !in ignoredModifiers }?.let { if (it is JavaModifier.Empty) KotlinModifier.Open else it }?.name?.let { keyword("$it ") } - f.modifiers()[sourceSet]?.toSignatureString()?.let { keyword(it) } + f.modifiers()[sourceSet]?.toSignatureString()?.takeIf { it.isNotEmpty() }?.let { keyword(it) } keyword("fun ") list( f.generics, prefix = "<", suffix = "> ", @@ -434,7 +434,7 @@ public class KotlinSignatureProvider( } is Variance<*> -> group(styles = emptySet()) { - keyword("$p ".takeIf { it.isNotBlank() } ?: "") + p.takeIf { it.toString().isNotEmpty() }?.let { keyword("$it ") } signatureForProjection(p.inner, showFullyQualifiedName) } -- cgit