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

FIR: fix FirAnnotationChecker for FirProperty

Browse Source 
This change is necessary for testTypeAliasExpansionRepeatedAnnotations
to work properly (otherwise we don't check a property at all). Before
current changes, the test worked thanks to accessors analysis which is
now OFF because of source kind check.
This commit is contained in:
Kirill Rakhman
2023-01-13 11:05:10 +01:00
committed by Space Team
parent 5a08d8da8d
commit 57dda3bf92
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt
+5 -3
View File
@@ -68,9 +68,11 @@ object FirAnnotationChecker : FirBasicDeclarationChecker() {
checkRepeatedAnnotations(declaration, context, reporter) checkRepeatedAnnotations(declaration, context, reporter)
if (declaration is FirProperty) { if (declaration is FirCallableDeclaration) {
checkRepeatedAnnotationsInProperty(declaration, context, reporter) if (declaration is FirProperty) {
} else if (declaration is FirCallableDeclaration) { checkRepeatedAnnotationsInProperty(declaration, context, reporter)
}
if (declaration.source?.kind is KtRealSourceElementKind && declaration.returnTypeRef.source?.kind is KtRealSourceElementKind) { if (declaration.source?.kind is KtRealSourceElementKind && declaration.returnTypeRef.source?.kind is KtRealSourceElementKind) {
checkRepeatedAnnotations(declaration.returnTypeRef.coneTypeSafe(), context, reporter) checkRepeatedAnnotations(declaration.returnTypeRef.coneTypeSafe(), context, reporter)
} }