azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SLC] DefaultAnnotationsProvider: add missing kotlin qualifiers check

Browse Source 
^KT-56046
This commit is contained in:
Dmitrii Gridin
2023-01-25 14:34:44 +01:00
committed by Space Team
parent e7eaf08cd7
commit e4795a9082
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/DefaultAnnotationsProvider.kt
+6 -1
View File
@@ -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<KtNamedAnnotationValue> = { emptyList() },
): PsiAnnotation? {
if (qualifiedName != javaQualifier) return null
if (qualifiedName != kotlinQualifier) return null
return SymbolLightJavaAnnotation(
originalLightAnnotation = this,
javaQualifier = javaQualifier,