[SLC] DefaultAnnotationsProvider: add missing kotlin qualifiers check
^KT-56046
This commit is contained in:
committed by
Space Team
parent
e7eaf08cd7
commit
e4795a9082
+6
-1
@@ -105,6 +105,7 @@ private fun SymbolLightLazyAnnotation.tryConvertToDocumentedJavaAnnotation(
|
|||||||
owner: PsiModifierList,
|
owner: PsiModifierList,
|
||||||
): PsiAnnotation? = tryConvertToJavaAnnotation(
|
): PsiAnnotation? = tryConvertToJavaAnnotation(
|
||||||
javaQualifier = JvmAnnotationNames.DOCUMENTED_ANNOTATION.asString(),
|
javaQualifier = JvmAnnotationNames.DOCUMENTED_ANNOTATION.asString(),
|
||||||
|
kotlinQualifier = StandardNames.FqNames.mustBeDocumented.asString(),
|
||||||
owner = owner,
|
owner = owner,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -126,6 +127,7 @@ private fun SymbolLightLazyAnnotation.tryConvertToRetentionJavaAnnotation(
|
|||||||
owner: PsiModifierList,
|
owner: PsiModifierList,
|
||||||
): PsiAnnotation? = tryConvertToJavaAnnotation(
|
): PsiAnnotation? = tryConvertToJavaAnnotation(
|
||||||
javaQualifier = JvmAnnotationNames.RETENTION_ANNOTATION.asString(),
|
javaQualifier = JvmAnnotationNames.RETENTION_ANNOTATION.asString(),
|
||||||
|
kotlinQualifier = StandardNames.FqNames.retention.asString(),
|
||||||
owner = owner,
|
owner = owner,
|
||||||
argumentsComputer = SymbolLightJavaAnnotation::computeJavaRetentionArguments,
|
argumentsComputer = SymbolLightJavaAnnotation::computeJavaRetentionArguments,
|
||||||
)
|
)
|
||||||
@@ -176,6 +178,7 @@ private fun SymbolLightLazyAnnotation.tryConvertToRepeatableJavaAnnotation(
|
|||||||
owner: PsiModifierList,
|
owner: PsiModifierList,
|
||||||
): PsiAnnotation? = tryConvertToJavaAnnotation(
|
): PsiAnnotation? = tryConvertToJavaAnnotation(
|
||||||
javaQualifier = JvmAnnotationNames.REPEATABLE_ANNOTATION.asString(),
|
javaQualifier = JvmAnnotationNames.REPEATABLE_ANNOTATION.asString(),
|
||||||
|
kotlinQualifier = StandardNames.FqNames.repeatable.asString(),
|
||||||
owner = owner,
|
owner = owner,
|
||||||
argumentsComputer = SymbolLightJavaAnnotation::computeRepeatableJavaAnnotationArguments,
|
argumentsComputer = SymbolLightJavaAnnotation::computeRepeatableJavaAnnotationArguments,
|
||||||
)
|
)
|
||||||
@@ -209,6 +212,7 @@ private fun SymbolLightLazyAnnotation.tryConvertToTargetJavaAnnotation(
|
|||||||
owner: PsiModifierList,
|
owner: PsiModifierList,
|
||||||
): PsiAnnotation? = tryConvertToJavaAnnotation(
|
): PsiAnnotation? = tryConvertToJavaAnnotation(
|
||||||
javaQualifier = JvmAnnotationNames.TARGET_ANNOTATION.asString(),
|
javaQualifier = JvmAnnotationNames.TARGET_ANNOTATION.asString(),
|
||||||
|
kotlinQualifier = StandardNames.FqNames.target.asString(),
|
||||||
owner = owner,
|
owner = owner,
|
||||||
argumentsComputer = SymbolLightJavaAnnotation::computeTargetJavaAnnotationArguments,
|
argumentsComputer = SymbolLightJavaAnnotation::computeTargetJavaAnnotationArguments,
|
||||||
)
|
)
|
||||||
@@ -286,10 +290,11 @@ private fun LazyAnnotationsBox.tryConvertToJavaAnnotation(
|
|||||||
|
|
||||||
private fun SymbolLightLazyAnnotation.tryConvertToJavaAnnotation(
|
private fun SymbolLightLazyAnnotation.tryConvertToJavaAnnotation(
|
||||||
javaQualifier: String,
|
javaQualifier: String,
|
||||||
|
kotlinQualifier: String,
|
||||||
owner: PsiModifierList,
|
owner: PsiModifierList,
|
||||||
argumentsComputer: SymbolLightJavaAnnotation.() -> List<KtNamedAnnotationValue> = { emptyList() },
|
argumentsComputer: SymbolLightJavaAnnotation.() -> List<KtNamedAnnotationValue> = { emptyList() },
|
||||||
): PsiAnnotation? {
|
): PsiAnnotation? {
|
||||||
if (qualifiedName != javaQualifier) return null
|
if (qualifiedName != kotlinQualifier) return null
|
||||||
return SymbolLightJavaAnnotation(
|
return SymbolLightJavaAnnotation(
|
||||||
originalLightAnnotation = this,
|
originalLightAnnotation = this,
|
||||||
javaQualifier = javaQualifier,
|
javaQualifier = javaQualifier,
|
||||||
|
|||||||
Reference in New Issue
Block a user