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

[AA] Add implementation for annotationApplicableTargets.

Browse Source 
Adds implementation and tests for the new
KtClassOrObjectSymbol.annotationApplicableTargets property on
KtSymbolInfoProvider. This implementation delegates to the canonical
implementation in AnnotationChecker for FE1.0, and to the implementation
in FirAnnotationHelpers for FIR.

This change also includes direct tests for annotationApplicableTargets,
and a fix for FirClassLikeSymbol.getAllowedAnnotationTargets in
FirAnnotationHelpers.
This commit is contained in:
Justin Paupore
2023-01-17 20:39:24 -08:00
committed by Ilya Kirillov
parent 3e80433356
commit eccbc66581
26 changed files with 470 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSymbolInfoProvider.kt
+3 -1
View File
@@ -22,6 +22,8 @@ public abstract class KtSymbolInfoProvider : KtAnalysisSessionComponent() {
public abstract fun getJavaGetterName(symbol: KtPropertySymbol): Name
public abstract fun getJavaSetterName(symbol: KtPropertySymbol): Name?
public abstract fun getAnnotationApplicableTargets(symbol: KtClassOrObjectSymbol): Set<KotlinTarget>?
}
public interface KtSymbolInfoProviderMixIn : KtAnalysisSessionMixIn {
@@ -66,5 +68,5 @@ public interface KtSymbolInfoProviderMixIn : KtAnalysisSessionMixIn {
/** Gets the set of applicable targets for an annotation class symbol. Returns `null` if the symbol is not an annotation class. */
public val KtClassOrObjectSymbol.annotationApplicableTargets: Set<KotlinTarget>?
get() = withValidityAssertion { null /* TODO */ }
get() = withValidityAssertion { analysisSession.symbolInfoProvider.getAnnotationApplicableTargets(this) }
}
analysis/analysis-api/testData/components/symbolInfoProvider/annotationApplicableTargets/defaultTargets.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
annotation class A()
@<caret>A object Foo
analysis/analysis-api/testData/components/symbolInfoProvider/annotationApplicableTargets/defaultTargets.txt
Vendored
+6
View File
@@ -0,0 +1,6 @@
KtAnnotationEntry: @A
Resolved annotation symbol:
annotation class A
Applicable targets: [ANNOTATION_CLASS, BACKING_FIELD, CLASS, CONSTRUCTOR, FIELD, FUNCTION, LOCAL_VARIABLE, PROPERTY, PROPERTY_GETTER, PROPERTY_SETTER, VALUE_PARAMETER]
analysis/analysis-api/testData/components/symbolInfoProvider/annotationApplicableTargets/emptyTargets.descriptors.txt
Vendored
+7
View File
@@ -0,0 +1,7 @@
KtAnnotationEntry: @A
Resolved annotation symbol:
@kotlin.annotation.Target(allowedTargets = [])
annotation class A
Applicable targets: []
analysis/analysis-api/testData/components/symbolInfoProvider/annotationApplicableTargets/emptyTargets.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
@Target()
annotation class A
@<caret>A object Foo
analysis/analysis-api/testData/components/symbolInfoProvider/annotationApplicableTargets/emptyTargets.txt
Vendored
+7
View File
@@ -0,0 +1,7 @@
KtAnnotationEntry: @A
Resolved annotation symbol:
@kotlin.annotation.Target
annotation class A
Applicable targets: []
analysis/analysis-api/testData/components/symbolInfoProvider/annotationApplicableTargets/javaAnnotation.descriptors.txt
Vendored
+7
View File
@@ -0,0 +1,7 @@
KtAnnotationEntry: @A
Resolved annotation symbol:
@kotlin.annotation.Target(allowedTargets = [kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FILE, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY_SETTER])
annotation class A
Applicable targets: [CLASS, FILE, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER]
analysis/analysis-api/testData/components/symbolInfoProvider/annotationApplicableTargets/javaAnnotation.kt
Vendored
+10
View File
@@ -0,0 +1,10 @@
// FILE: A.java
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target({ElementType.TYPE, ElementType.METHOD})
public @interface A {}
// FILE: Foo.kt
@<caret>A object Foo
analysis/analysis-api/testData/components/symbolInfoProvider/annotationApplicableTargets/javaAnnotation.txt
Vendored
+7
View File
@@ -0,0 +1,7 @@
KtAnnotationEntry: @A
Resolved annotation symbol:
@kotlin.annotation.Target(allowedTargets = [kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION, kotlin.annotation.AnnotationTarget.PROPERTY_GETTER, kotlin.annotation.AnnotationTarget.PROPERTY_SETTER, kotlin.annotation.AnnotationTarget.FILE])
annotation class A
Applicable targets: [CLASS, FILE, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER]
analysis/analysis-api/testData/components/symbolInfoProvider/annotationApplicableTargets/listedTargets.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
import kotlin.annotation.AnnotationTarget
import kotlin.annotation.Target
@Target(AnnotationTarget.CLASS, AnnotationTarget.PROPERTY)
annotation class A
@<caret>A object Foo
analysis/analysis-api/testData/components/symbolInfoProvider/annotationApplicableTargets/listedTargets.txt
Vendored
+7
View File
@@ -0,0 +1,7 @@
KtAnnotationEntry: @A
Resolved annotation symbol:
@kotlin.annotation.Target(allowedTargets = [kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.PROPERTY])
annotation class A
Applicable targets: [CLASS, PROPERTY]
analysis/analysis-api/testData/components/symbolInfoProvider/annotationApplicableTargets/nonAnnotationClass.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
class A()
@<caret>A object Foo
analysis/analysis-api/testData/components/symbolInfoProvider/annotationApplicableTargets/nonAnnotationClass.txt
Vendored
+6
View File
@@ -0,0 +1,6 @@
KtAnnotationEntry: @A
Resolved annotation symbol:
class A
Applicable targets: <null>
analysis/analysis-api/testData/symbols/symbolByPsi/annotations.descriptors.txt
Vendored
+1 -1
View File
@@ -180,7 +180,7 @@ KtNamedClassOrObjectSymbol:
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
annotationApplicableTargets: [CLASS, ANNOTATION_CLASS, PROPERTY, FIELD, LOCAL_VARIABLE, VALUE_PARAMETER, CONSTRUCTOR, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, BACKING_FIELD]
deprecationStatus: null
KtFunctionSymbol:
analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt
Vendored
+1 -1
View File
@@ -180,7 +180,7 @@ KtNamedClassOrObjectSymbol:
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
annotationApplicableTargets: [CLASS, ANNOTATION_CLASS, PROPERTY, FIELD, LOCAL_VARIABLE, VALUE_PARAMETER, CONSTRUCTOR, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, BACKING_FIELD]
deprecationStatus: null
KtFunctionSymbol:
analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt
Vendored
+4 -4
View File
@@ -22,7 +22,7 @@ KtNamedClassOrObjectSymbol:
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
annotationApplicableTargets: [TYPE]
deprecationStatus: null
KtNamedClassOrObjectSymbol:
@@ -49,7 +49,7 @@ KtNamedClassOrObjectSymbol:
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
annotationApplicableTargets: [TYPE]
deprecationStatus: null
KtNamedClassOrObjectSymbol:
@@ -76,7 +76,7 @@ KtNamedClassOrObjectSymbol:
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
annotationApplicableTargets: [TYPE]
deprecationStatus: null
KtNamedClassOrObjectSymbol:
@@ -103,7 +103,7 @@ KtNamedClassOrObjectSymbol:
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
annotationApplicableTargets: [TYPE]
deprecationStatus: null
KtNamedClassOrObjectSymbol:
analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt
Vendored
+4 -4
View File
@@ -22,7 +22,7 @@ KtNamedClassOrObjectSymbol:
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
annotationApplicableTargets: [TYPE]
deprecationStatus: null
KtNamedClassOrObjectSymbol:
@@ -49,7 +49,7 @@ KtNamedClassOrObjectSymbol:
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
annotationApplicableTargets: [TYPE]
deprecationStatus: null
KtNamedClassOrObjectSymbol:
@@ -76,7 +76,7 @@ KtNamedClassOrObjectSymbol:
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
annotationApplicableTargets: [TYPE]
deprecationStatus: null
KtNamedClassOrObjectSymbol:
@@ -103,7 +103,7 @@ KtNamedClassOrObjectSymbol:
typeParameters: []
visibility: Public
getContainingModule: KtSourceModule "Sources of main"
annotationApplicableTargets: null
annotationApplicableTargets: [TYPE]
deprecationStatus: null
KtNamedClassOrObjectSymbol: