From e4795a90820d6219c929dee962a43e91203e1b74 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Wed, 25 Jan 2023 14:34:44 +0100 Subject: [PATCH] [SLC] DefaultAnnotationsProvider: add missing kotlin qualifiers check ^KT-56046 --- .../symbol/annotations/DefaultAnnotationsProvider.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/DefaultAnnotationsProvider.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/DefaultAnnotationsProvider.kt index 8be614e8140..d6aadfa18e3 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/DefaultAnnotationsProvider.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/DefaultAnnotationsProvider.kt @@ -105,6 +105,7 @@ private fun SymbolLightLazyAnnotation.tryConvertToDocumentedJavaAnnotation( owner: PsiModifierList, ): PsiAnnotation? = tryConvertToJavaAnnotation( javaQualifier = JvmAnnotationNames.DOCUMENTED_ANNOTATION.asString(), + kotlinQualifier = StandardNames.FqNames.mustBeDocumented.asString(), owner = owner, ) @@ -126,6 +127,7 @@ private fun SymbolLightLazyAnnotation.tryConvertToRetentionJavaAnnotation( owner: PsiModifierList, ): PsiAnnotation? = tryConvertToJavaAnnotation( javaQualifier = JvmAnnotationNames.RETENTION_ANNOTATION.asString(), + kotlinQualifier = StandardNames.FqNames.retention.asString(), owner = owner, argumentsComputer = SymbolLightJavaAnnotation::computeJavaRetentionArguments, ) @@ -176,6 +178,7 @@ private fun SymbolLightLazyAnnotation.tryConvertToRepeatableJavaAnnotation( owner: PsiModifierList, ): PsiAnnotation? = tryConvertToJavaAnnotation( javaQualifier = JvmAnnotationNames.REPEATABLE_ANNOTATION.asString(), + kotlinQualifier = StandardNames.FqNames.repeatable.asString(), owner = owner, argumentsComputer = SymbolLightJavaAnnotation::computeRepeatableJavaAnnotationArguments, ) @@ -209,6 +212,7 @@ private fun SymbolLightLazyAnnotation.tryConvertToTargetJavaAnnotation( owner: PsiModifierList, ): PsiAnnotation? = tryConvertToJavaAnnotation( javaQualifier = JvmAnnotationNames.TARGET_ANNOTATION.asString(), + kotlinQualifier = StandardNames.FqNames.target.asString(), owner = owner, argumentsComputer = SymbolLightJavaAnnotation::computeTargetJavaAnnotationArguments, ) @@ -286,10 +290,11 @@ private fun LazyAnnotationsBox.tryConvertToJavaAnnotation( private fun SymbolLightLazyAnnotation.tryConvertToJavaAnnotation( javaQualifier: String, + kotlinQualifier: String, owner: PsiModifierList, argumentsComputer: SymbolLightJavaAnnotation.() -> List = { emptyList() }, ): PsiAnnotation? { - if (qualifiedName != javaQualifier) return null + if (qualifiedName != kotlinQualifier) return null return SymbolLightJavaAnnotation( originalLightAnnotation = this, javaQualifier = javaQualifier,