diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinIdeDeclarationRenderer.kt b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinIdeDeclarationRenderer.kt index fea49ceac71d..08d5a4f7c899 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinIdeDeclarationRenderer.kt +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/src/org/jetbrains/kotlin/idea/k2/codeinsight/quickDoc/KotlinIdeDeclarationRenderer.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.kotlin.idea.k2.codeinsight.quickDoc import com.google.common.html.HtmlEscapers @@ -91,6 +91,7 @@ import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.SpecialNames +import org.jetbrains.kotlin.psi.KtAnnotationEntry import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtNameReferenceExpression import org.jetbrains.kotlin.psi.KtParameter @@ -278,7 +279,7 @@ internal class KotlinIdeDeclarationRenderer( } ) { annotation -> append(highlight("@") { asAnnotationName }) - (annotation.useSiteTarget?.renderName + ((annotation.psi as? KtAnnotationEntry)?.useSiteTarget?.getAnnotationUseSiteTarget()?.renderName ?: "field".takeIf { backingFieldAnnotations != null && annotation in backingFieldAnnotations })?.let { useSiteName -> printer.append(highlight(useSiteName) { asKeyword }) printer.append(highlight(":") { asColon }) diff --git a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelFunctionParameterInfoHandler.kt b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelFunctionParameterInfoHandler.kt index ae286e0f75b4..3cfb92589d06 100644 --- a/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelFunctionParameterInfoHandler.kt +++ b/plugins/kotlin/fir/src/org/jetbrains/kotlin/idea/parameterInfo/KotlinHighLevelFunctionParameterInfoHandler.kt @@ -24,7 +24,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.KaValueParameterSymbol import org.jetbrains.kotlin.analysis.api.symbols.name import org.jetbrains.kotlin.analysis.api.types.KaErrorType import org.jetbrains.kotlin.config.LanguageFeature -import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.idea.base.analysis.api.utils.CallParameterInfoProvider import org.jetbrains.kotlin.idea.base.analysis.api.utils.collectCallCandidates import org.jetbrains.kotlin.idea.base.analysis.api.utils.defaultValue @@ -321,11 +320,6 @@ abstract class KotlinHighLevelParameterInfoWithCallHandlerBase { - functionSymbol.getJvmNameFromAnnotation(allowedUseSiteTargets = setOf(PROPERTY_GETTER, null)) - } - is KaPropertySetterSymbol -> { - functionSymbol.getJvmNameFromAnnotation(allowedUseSiteTargets = setOf(PROPERTY_SETTER, null)) - } - else -> { - functionSymbol.getJvmNameFromAnnotation() - } - } + val jvmName = functionSymbol.getJvmNameFromAnnotation() val id = jvmName ?: functionSymbol.callableId?.callableName?.identifierOrNullIfSpecial ?: psi?.name @@ -406,18 +391,14 @@ private fun KaCallInfo?.typeArgumentsMappingOrEmptyMap(): Map = emptySet()): String? { +private fun KaAnnotatedSymbol.getJvmNameFromAnnotation(): String? { for (annotation in annotations[JvmStandardClassIds.JVM_NAME_CLASS_ID]) { - if (allowedUseSiteTargets.isEmpty() || annotation.useSiteTarget in allowedUseSiteTargets) { - val firstArgumentExpression = annotation.arguments.firstOrNull()?.expression - if (firstArgumentExpression is KaAnnotationValue.ConstantValue) { - return firstArgumentExpression.value.value as? String - } - break + val firstArgumentExpression = annotation.arguments.firstOrNull()?.expression + if (firstArgumentExpression is KaAnnotationValue.ConstantValue) { + return firstArgumentExpression.value.value as? String } + break } return null