From f5e7cffbebb66b989c64bdda61e1f7809ddc6068 Mon Sep 17 00:00:00 2001 From: Marcin Aman Date: Tue, 29 Dec 2020 14:38:19 +0100 Subject: Parsing of JvmName (#1675) * Parsing of JvmName * Make JvmName processor run after KaJ --- plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/base/src/main/kotlin/signatures') diff --git a/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt b/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt index f934faa5..3851b39c 100644 --- a/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt +++ b/plugins/base/src/main/kotlin/signatures/JvmSignatureUtils.kt @@ -21,7 +21,7 @@ interface JvmSignatureUtils { joinToString("") { it.name.toLowerCase() + " " } fun WithExtraProperties.annotations(): SourceSetDependent> = - extra[Annotations]?.content ?: emptyMap() + extra[Annotations]?.directAnnotations ?: emptyMap() private fun PageContentBuilder.DocumentableContentBuilder.annotations( d: Documentable, @@ -131,7 +131,7 @@ interface JvmSignatureUtils { } fun WithExtraProperties.stylesIfDeprecated(sourceSetData: DokkaSourceSet): Set = - if (extra[Annotations]?.content?.get(sourceSetData)?.any { + if (extra[Annotations]?.directAnnotations?.get(sourceSetData)?.any { it.dri == DRI("kotlin", "Deprecated") || it.dri == DRI("java.lang", "Deprecated") } == true) setOf(TextStyle.Strikethrough) else emptySet() -- cgit