From f7eeedb6a157ff449c33a2c822db083bff7b4e15 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Tue, 1 Oct 2024 13:12:04 +0200 Subject: [PATCH] [kotlin] fix "Add annotation" quickfix in K2 mode (KTIJ-31459) In regular cases 'annotationTarget' is null, so the empty prefix should be used instead of silently exiting. 'addAnnotationEntry' in K1 works this way. GitOrigin-RevId: 0ee53829a2575b6d57b6c14f927e80b4c482af3c --- .../createFromUsage/K2CreatePropertyFromUsageBuilder.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickFixes/createFromUsage/K2CreatePropertyFromUsageBuilder.kt b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickFixes/createFromUsage/K2CreatePropertyFromUsageBuilder.kt index 4bbcbaeef544..a47390aa82bb 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickFixes/createFromUsage/K2CreatePropertyFromUsageBuilder.kt +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickFixes/createFromUsage/K2CreatePropertyFromUsageBuilder.kt @@ -204,14 +204,11 @@ object K2CreatePropertyFromUsageBuilder { request: AnnotationRequest, annotationTarget: AnnotationUseSiteTarget? ): KtAnnotationEntry? { - - if (annotationTarget == null) return null - val declaration = target as? KtDeclaration ?: return null val classId = ClassId.topLevel(FqName(request.qualifiedName)) val annotationUseSiteTargetPrefix = - if (isApplicableTargetSet(declaration, classId, fieldAnnotationTargetCallableId)) { + if (annotationTarget == null || isApplicableTargetSet(declaration, classId, fieldAnnotationTargetCallableId)) { "" } else { "${annotationTarget.renderName}:"