diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtAnnotatedSymbol.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtAnnotatedSymbol.kt index 58c17768514..5427905d3ad 100644 --- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtAnnotatedSymbol.kt +++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/markers/KtAnnotatedSymbol.kt @@ -22,4 +22,7 @@ data class KtNamedConstantValue(val name: String, val expression: KtConstantValu interface KtAnnotatedSymbol : KtSymbol { val annotations: List + + fun containsAnnotation(classId: ClassId): Boolean + val annotationClassIds: Collection } \ No newline at end of file diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnonymousObjectSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnonymousObjectSymbol.kt index 220f2ec84ad..d36a66db2d6 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnonymousObjectSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnonymousObjectSymbol.kt @@ -11,6 +11,9 @@ import org.jetbrains.kotlin.idea.fir.findPsi import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState import org.jetbrains.kotlin.idea.frontend.api.ValidityToken import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.containsAnnotation +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.getAnnotationClassIds +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotationsList import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef import org.jetbrains.kotlin.idea.frontend.api.symbols.KtAnonymousObjectSymbol @@ -20,6 +23,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtTypeAndAnnotatio import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.CanNotCreateSymbolPointerForLocalLibraryDeclarationException import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.name.ClassId internal class KtFirAnonymousObjectSymbol( fir: FirAnonymousObject, @@ -32,9 +36,9 @@ internal class KtFirAnonymousObjectSymbol( override val symbolKind: KtSymbolKind = KtSymbolKind.LOCAL override val psi: PsiElement? by firRef.withFirAndCache { fir -> fir.findPsi(fir.session) } - override val annotations: List by cached { - firRef.toAnnotationsList() - } + override val annotations: List by cached { firRef.toAnnotationsList() } + override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) + override val annotationClassIds: Collection by cached { firRef.getAnnotationClassIds() } override val superTypes: List by cached { firRef.superTypesAndAnnotationsList(builder) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirClassOrObjectSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirClassOrObjectSymbol.kt index d6f517b9686..be274eb3578 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirClassOrObjectSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirClassOrObjectSymbol.kt @@ -12,6 +12,9 @@ import org.jetbrains.kotlin.idea.fir.findPsi import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState import org.jetbrains.kotlin.idea.frontend.api.ValidityToken import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.containsAnnotation +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.getAnnotationClassIds +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotationsList import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.KtFirClassOrObjectInLibrarySymbol import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef @@ -42,9 +45,9 @@ internal class KtFirClassOrObjectSymbol( override val visibility: KtSymbolVisibility get() = getVisibility() - override val annotations: List by cached { - firRef.toAnnotationsList() - } + override val annotations: List by cached { firRef.toAnnotationsList() } + override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) + override val annotationClassIds: Collection by cached { firRef.getAnnotationClassIds() } override val isInner: Boolean get() = firRef.withFir(FirResolvePhase.STATUS) { it.isInner } override val isData: Boolean get() = firRef.withFir(FirResolvePhase.STATUS) { it.isData } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt index e9cfe6dc6b1..494acdbf6d5 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorSymbol.kt @@ -13,6 +13,9 @@ import org.jetbrains.kotlin.idea.fir.findPsi import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState import org.jetbrains.kotlin.idea.frontend.api.ValidityToken import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.containsAnnotation +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.getAnnotationClassIds +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotationsList import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.KtFirConstructorSymbolPointer import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.createSignature import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached @@ -51,9 +54,9 @@ internal class KtFirConstructorSymbol( override val visibility: KtSymbolVisibility get() = getVisibility() - override val annotations: List by cached { - firRef.toAnnotationsList() - } + override val annotations: List by cached { firRef.toAnnotationsList() } + override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) + override val annotationClassIds: Collection by cached { firRef.getAnnotationClassIds() } override val containingClassIdIfNonLocal: ClassId? get() = firRef.withFir { fir -> fir.containingClass()?.classId /* TODO check if local */ } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorValueParameterSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorValueParameterSymbol.kt index fb4acdfb76d..4c78025dc82 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorValueParameterSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirConstructorValueParameterSymbol.kt @@ -12,6 +12,9 @@ import org.jetbrains.kotlin.idea.fir.findPsi import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState import org.jetbrains.kotlin.idea.frontend.api.ValidityToken import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.containsAnnotation +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.getAnnotationClassIds +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotationsList import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef import org.jetbrains.kotlin.idea.frontend.api.symbols.KtConstructorParameterSymbol @@ -21,6 +24,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtTypeAndAnnotations import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name internal class KtFirConstructorValueParameterSymbol( @@ -44,9 +48,9 @@ internal class KtFirConstructorValueParameterSymbol( } } - override val annotations: List by cached { - firRef.toAnnotationsList() - } + override val annotations: List by cached { firRef.toAnnotationsList() } + override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) + override val annotationClassIds: Collection by cached { firRef.getAnnotationClassIds() } override val constructorParameterKind: KtConstructorParameterSymbolKind get() = firRef.withFir { fir -> diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFileSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFileSymbol.kt index 0055f924281..76e1709e59e 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFileSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFileSymbol.kt @@ -11,12 +11,17 @@ import org.jetbrains.kotlin.idea.fir.findPsi import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState import org.jetbrains.kotlin.idea.frontend.api.ValidityToken import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.containsAnnotation +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.getAnnotationClassIds +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotationsList +import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFileSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithDeclarations import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.name.ClassId internal class KtFirFileSymbol( fir: FirFile, @@ -33,7 +38,7 @@ internal class KtFirFileSymbol( TODO("Creating pointers for files from library is not supported yet") } - override val annotations: List by firRef.withFirAndCache { fir -> - fir.annotations.map { KtFirAnnotationCall(firRef, it) } - } + override val annotations: List by cached { firRef.toAnnotationsList() } + override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) + override val annotationClassIds: Collection by cached { firRef.getAnnotationClassIds() } } \ No newline at end of file diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt index b28e9cfc53e..06f4762cb9c 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt @@ -12,6 +12,9 @@ import org.jetbrains.kotlin.idea.fir.findPsi import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState import org.jetbrains.kotlin.idea.frontend.api.ValidityToken import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.containsAnnotation +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.getAnnotationClassIds +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotationsList import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.KtFirMemberFunctionSymbolPointer import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.createSignature import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached @@ -22,6 +25,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.CanNotCreateSymbo import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer import org.jetbrains.kotlin.idea.frontend.api.types.KtType +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -48,9 +52,9 @@ internal class KtFirFunctionSymbol( } } - override val annotations: List by cached { - firRef.toAnnotationsList() - } + override val annotations: List by cached { firRef.toAnnotationsList() } + override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) + override val annotationClassIds: Collection by cached { firRef.getAnnotationClassIds() } override val isSuspend: Boolean get() = firRef.withFir { it.isSuspend } override val isOverride: Boolean get() = firRef.withFir { it.isOverride } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionValueParameterSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionValueParameterSymbol.kt index 04f9d434a0a..6b6615ea4b0 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionValueParameterSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionValueParameterSymbol.kt @@ -12,6 +12,9 @@ import org.jetbrains.kotlin.idea.fir.findPsi import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState import org.jetbrains.kotlin.idea.frontend.api.ValidityToken import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.containsAnnotation +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.getAnnotationClassIds +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotationsList import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef import org.jetbrains.kotlin.idea.frontend.api.symbols.KtFunctionParameterSymbol @@ -19,6 +22,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtTypeAndAnnotations import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name internal class KtFirFunctionValueParameterSymbol( @@ -38,9 +42,9 @@ internal class KtFirFunctionValueParameterSymbol( override val hasDefaultValue: Boolean get() = firRef.withFir { it.defaultValue != null } - override val annotations: List by cached { - firRef.toAnnotationsList() - } + override val annotations: List by cached { firRef.toAnnotationsList() } + override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) + override val annotationClassIds: Collection by cached { firRef.getAnnotationClassIds() } override fun createPointer(): KtSymbolPointer { KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirKotlinPropertySymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirKotlinPropertySymbol.kt index 94dbfb502b2..dc22f4ea21f 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirKotlinPropertySymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirKotlinPropertySymbol.kt @@ -13,6 +13,9 @@ import org.jetbrains.kotlin.idea.fir.findPsi import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState import org.jetbrains.kotlin.idea.frontend.api.ValidityToken import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.containsAnnotation +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.getAnnotationClassIds +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotationsList import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.KtFirMemberPropertySymbolPointer import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.createSignature import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached @@ -26,6 +29,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.* import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.CanNotCreateSymbolPointerForLocalLibraryDeclarationException import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.idea.frontend.api.types.KtType import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -72,9 +76,9 @@ internal class KtFirKotlinPropertySymbol( override val visibility: KtSymbolVisibility get() = getVisibility() - override val annotations: List by cached { - firRef.toAnnotationsList() - } + override val annotations: List by cached { firRef.toAnnotationsList() } + override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) + override val annotationClassIds: Collection by cached { firRef.getAnnotationClassIds() } override val callableIdIfNonLocal: FqName? get() = firRef.withFir { fir -> diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertyGetterSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertyGetterSymbol.kt index 3a0c242d0de..3a2cb873b1b 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertyGetterSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertyGetterSymbol.kt @@ -12,12 +12,16 @@ import org.jetbrains.kotlin.idea.fir.findPsi import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState import org.jetbrains.kotlin.idea.frontend.api.ValidityToken import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.containsAnnotation +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.getAnnotationClassIds +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotationsList import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertyGetterSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.* import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.idea.frontend.api.types.KtType internal class KtFirPropertyGetterSymbol( @@ -51,9 +55,10 @@ internal class KtFirPropertyGetterSymbol( } override val modality: KtCommonSymbolModality get() = firRef.withFir(FirResolvePhase.STATUS) { it.modality.getSymbolModality() } override val visibility: KtSymbolVisibility get() = firRef.withFir(FirResolvePhase.STATUS) { it.visibility.getSymbolVisibility() } - override val annotations: List by cached { - firRef.toAnnotationsList() - } + + override val annotations: List by cached { firRef.toAnnotationsList() } + override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) + override val annotationClassIds: Collection by cached { firRef.getAnnotationClassIds() } override val dispatchType: KtType? by cached { firRef.dispatchReceiverTypeAndAnnotations(builder) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySetterSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySetterSymbol.kt index ffb8315c10a..dba40421bf4 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySetterSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirPropertySetterSymbol.kt @@ -12,6 +12,9 @@ import org.jetbrains.kotlin.idea.fir.findPsi import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState import org.jetbrains.kotlin.idea.frontend.api.ValidityToken import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.containsAnnotation +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.getAnnotationClassIds +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotationsList import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef import org.jetbrains.kotlin.idea.frontend.api.symbols.KtPropertySetterSymbol @@ -19,6 +22,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSetterParameterSymbol import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.* import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.idea.frontend.api.types.KtType internal class KtFirPropertySetterSymbol( @@ -41,9 +45,11 @@ internal class KtFirPropertySetterSymbol( override val modality: KtCommonSymbolModality get() = firRef.withFir(FirResolvePhase.STATUS) { it.modality.getSymbolModality() } override val visibility: KtSymbolVisibility get() = firRef.withFir(FirResolvePhase.STATUS) { it.visibility.getSymbolVisibility() } - override val annotations: List by cached { - firRef.toAnnotationsList() - } + + override val annotations: List by cached { firRef.toAnnotationsList() } + override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) + override val annotationClassIds: Collection by cached { firRef.getAnnotationClassIds() } + override val parameter: KtSetterParameterSymbol by firRef.withFirAndCache { fir -> builder.buildFirSetterParameter(fir.valueParameters.single()) } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSetterParameterSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSetterParameterSymbol.kt index 7a8368bdac5..695d727f7b7 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSetterParameterSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSetterParameterSymbol.kt @@ -12,6 +12,9 @@ import org.jetbrains.kotlin.idea.fir.findPsi import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState import org.jetbrains.kotlin.idea.frontend.api.ValidityToken import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.containsAnnotation +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.getAnnotationClassIds +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotationsList import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSetterParameterSymbol @@ -19,6 +22,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtAnnotationCall import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtTypeAndAnnotations import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name internal class KtFirSetterParameterSymbol( @@ -38,9 +42,9 @@ internal class KtFirSetterParameterSymbol( override val isVararg: Boolean = false - override val annotations: List by cached { - firRef.toAnnotationsList() - } + override val annotations: List by cached { firRef.toAnnotationsList() } + override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) + override val annotationClassIds: Collection by cached { firRef.getAnnotationClassIds() } override fun createPointer(): KtSymbolPointer { KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt index 9a54b6b66a8..874a9dbb33d 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt @@ -13,6 +13,9 @@ import org.jetbrains.kotlin.idea.fir.findPsi import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState import org.jetbrains.kotlin.idea.frontend.api.ValidityToken import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.containsAnnotation +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.getAnnotationClassIds +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.toAnnotationsList import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.KtFirMemberPropertySymbolPointer import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.pointers.createSignature import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached @@ -26,6 +29,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.* import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.CanNotCreateSymbolPointerForLocalLibraryDeclarationException import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.idea.frontend.api.types.KtType import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name @@ -57,9 +61,9 @@ internal class KtFirSyntheticJavaPropertySymbol( override val modality: KtCommonSymbolModality get() = getModality() override val visibility: KtSymbolVisibility get() = getVisibility() - override val annotations: List by cached { - firRef.toAnnotationsList() - } + override val annotations: List by cached { firRef.toAnnotationsList() } + override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) + override val annotationClassIds: Collection by cached { firRef.getAnnotationClassIds() } override val callableIdIfNonLocal: FqName? get() = firRef.withFir { fir -> diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirTypeAndAnnotations.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirTypeAndAnnotations.kt index ce6ef82ce16..0dd992d5012 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirTypeAndAnnotations.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirTypeAndAnnotations.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.idea.frontend.api.ValidityToken import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations.KtFirAnnotationCall import org.jetbrains.kotlin.idea.frontend.api.fir.utils.FirRefWithValidityCheck import org.jetbrains.kotlin.idea.frontend.api.fir.utils.cached import org.jetbrains.kotlin.idea.frontend.api.fir.utils.weakRef diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnnotationCall.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/KtFirAnnotationCall.kt similarity index 73% rename from idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnnotationCall.kt rename to idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/KtFirAnnotationCall.kt index 3e84c1291ac..61f0275e225 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirAnnotationCall.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/KtFirAnnotationCall.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.frontend.api.fir.symbols +package org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.FirSession @@ -11,19 +11,17 @@ import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall -import org.jetbrains.kotlin.fir.resolve.fullyExpandedType -import org.jetbrains.kotlin.fir.resolve.toSymbol -import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol +import org.jetbrains.kotlin.fir.expressions.classId +import org.jetbrains.kotlin.fir.expressions.coneClassLikeType import org.jetbrains.kotlin.fir.types.ConeClassLikeType import org.jetbrains.kotlin.fir.types.classId import org.jetbrains.kotlin.fir.types.coneType import org.jetbrains.kotlin.idea.fir.findPsi -import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState import org.jetbrains.kotlin.idea.frontend.api.ValidityToken +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.expandTypeAliasIfNeeded import org.jetbrains.kotlin.idea.frontend.api.fir.utils.* import org.jetbrains.kotlin.idea.frontend.api.fir.utils.FirRefWithValidityCheck import org.jetbrains.kotlin.idea.frontend.api.fir.utils.convertConstantExpression -import org.jetbrains.kotlin.idea.frontend.api.fir.utils.firRef import org.jetbrains.kotlin.idea.frontend.api.fir.utils.mapAnnotationParameters import org.jetbrains.kotlin.idea.frontend.api.fir.utils.weakRef import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.* @@ -43,9 +41,8 @@ internal class KtFirAnnotationCall( fir.findPsi(fir.session) as? KtCallElement } - override val classId: ClassId? by containingDeclaration.withFirAndCache(FirResolvePhase.TYPES) { fir -> - val declaredCone = annotationCallRef.annotationTypeRef.coneType as? ConeClassLikeType - declaredCone?.expandTypeAliasIfNeeded(fir.session)?.classId + override val classId: ClassId? by containingDeclaration.withFirAndCache(AnnotationPhases.PHASE_FOR_ANNOTATION_CLASS_ID) { fir -> + annotationCallRef.getClassId(fir.session) } override val useSiteTarget: AnnotationUseSiteTarget? get() = annotationCallRef.useSiteTarget @@ -56,7 +53,3 @@ internal class KtFirAnnotationCall( } } } - -internal fun FirRefWithValidityCheck.toAnnotationsList() = withFir { fir -> - fir.annotations.map { KtFirAnnotationCall(this, it) } -} \ No newline at end of file diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/firAnnotationUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/firAnnotationUtils.kt new file mode 100644 index 00000000000..2e2c1050bfc --- /dev/null +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/firAnnotationUtils.kt @@ -0,0 +1,39 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations + +import org.jetbrains.kotlin.fir.FirSession +import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration +import org.jetbrains.kotlin.fir.declarations.FirResolvePhase +import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.coneClassLikeType +import org.jetbrains.kotlin.fir.types.classId +import org.jetbrains.kotlin.idea.frontend.api.fir.symbols.expandTypeAliasIfNeeded +import org.jetbrains.kotlin.idea.frontend.api.fir.utils.FirRefWithValidityCheck +import org.jetbrains.kotlin.name.ClassId + + +internal fun FirAnnotationCall.getClassId(session: FirSession): ClassId? = + coneClassLikeType?.expandTypeAliasIfNeeded(session)?.classId + +internal fun FirRefWithValidityCheck.toAnnotationsList() = withFir { fir -> + fir.annotations.map { KtFirAnnotationCall(this, it) } +} + +internal fun FirRefWithValidityCheck.containsAnnotation(classId: ClassId): Boolean = + withFir(AnnotationPhases.PHASE_FOR_ANNOTATION_CLASS_ID) { fir -> + fir.annotations.any { it.getClassId(fir.session) == classId } + } + +internal fun FirRefWithValidityCheck.getAnnotationClassIds(): Collection = + withFir(AnnotationPhases.PHASE_FOR_ANNOTATION_CLASS_ID) { fir -> + fir.annotations.mapNotNull { it.getClassId(fir.session) } + } + + +internal object AnnotationPhases { + val PHASE_FOR_ANNOTATION_CLASS_ID = FirResolvePhase.TYPES +} \ No newline at end of file diff --git a/idea/idea-frontend-fir/testData/fileScopeTest/simpleFileScope.kt.result b/idea/idea-frontend-fir/testData/fileScopeTest/simpleFileScope.kt.result index 42e97ff1d2e..5b53defec0b 100644 --- a/idea/idea-frontend-fir/testData/fileScopeTest/simpleFileScope.kt.result +++ b/idea/idea-frontend-fir/testData/fileScopeTest/simpleFileScope.kt.result @@ -1,5 +1,6 @@ FILE SYMBOL: KtFirFileSymbol: + annotationClassIds: [] annotations: [] origin: SOURCE @@ -9,6 +10,7 @@ CALLABLE NAMES: CALLABLE SYMBOLS: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: test dispatchType: null @@ -29,6 +31,7 @@ KtFirFunctionSymbol: KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: testVal dispatchType: null @@ -55,6 +58,7 @@ CLASSIFIER NAMES: CLASSIFIER SYMBOLS: KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: C classKind: CLASS @@ -73,6 +77,7 @@ KtFirClassOrObjectSymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: I classKind: INTERFACE diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt index 5b2cc12f6dc..47aea143c5f 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/Int.txt @@ -3,6 +3,7 @@ class: kotlin/Int // SYMBOLS: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.and dispatchType: kotlin/Int @@ -23,6 +24,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.compareTo dispatchType: kotlin/Int @@ -43,6 +45,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.compareTo dispatchType: kotlin/Int @@ -63,6 +66,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.compareTo dispatchType: kotlin/Int @@ -83,6 +87,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.compareTo dispatchType: kotlin/Int @@ -103,6 +108,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.compareTo dispatchType: kotlin/Int @@ -123,6 +129,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.compareTo dispatchType: kotlin/Int @@ -143,6 +150,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.dec dispatchType: kotlin/Int @@ -163,6 +171,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.div dispatchType: kotlin/Int @@ -183,6 +192,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Double + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.div dispatchType: kotlin/Int @@ -203,6 +213,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Float + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.div dispatchType: kotlin/Int @@ -223,6 +234,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.div dispatchType: kotlin/Int @@ -243,6 +255,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Long + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.div dispatchType: kotlin/Int @@ -263,6 +276,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.div dispatchType: kotlin/Int @@ -283,6 +297,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.inc dispatchType: kotlin/Int @@ -303,6 +318,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.inv dispatchType: kotlin/Int @@ -323,6 +339,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.minus dispatchType: kotlin/Int @@ -343,6 +360,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Double + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.minus dispatchType: kotlin/Int @@ -363,6 +381,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Float + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.minus dispatchType: kotlin/Int @@ -383,6 +402,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.minus dispatchType: kotlin/Int @@ -403,6 +423,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Long + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.minus dispatchType: kotlin/Int @@ -423,6 +444,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.minus dispatchType: kotlin/Int @@ -443,6 +465,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.or dispatchType: kotlin/Int @@ -463,6 +486,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.plus dispatchType: kotlin/Int @@ -483,6 +507,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Double + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.plus dispatchType: kotlin/Int @@ -503,6 +528,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Float + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.plus dispatchType: kotlin/Int @@ -523,6 +549,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.plus dispatchType: kotlin/Int @@ -543,6 +570,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Long + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.plus dispatchType: kotlin/Int @@ -563,6 +591,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.plus dispatchType: kotlin/Int @@ -583,6 +612,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/ranges/IntRange + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.rangeTo dispatchType: kotlin/Int @@ -603,6 +633,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/ranges/IntRange + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.rangeTo dispatchType: kotlin/Int @@ -623,6 +654,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/ranges/LongRange + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.rangeTo dispatchType: kotlin/Int @@ -643,6 +675,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/ranges/IntRange + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.rangeTo dispatchType: kotlin/Int @@ -663,6 +696,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [kotlin/SinceKotlin] annotations: [kotlin/SinceKotlin(version = 1.1)] callableIdIfNonLocal: kotlin.Int.rem dispatchType: kotlin/Int @@ -683,6 +717,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Double + annotationClassIds: [kotlin/SinceKotlin] annotations: [kotlin/SinceKotlin(version = 1.1)] callableIdIfNonLocal: kotlin.Int.rem dispatchType: kotlin/Int @@ -703,6 +738,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Float + annotationClassIds: [kotlin/SinceKotlin] annotations: [kotlin/SinceKotlin(version = 1.1)] callableIdIfNonLocal: kotlin.Int.rem dispatchType: kotlin/Int @@ -723,6 +759,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [kotlin/SinceKotlin] annotations: [kotlin/SinceKotlin(version = 1.1)] callableIdIfNonLocal: kotlin.Int.rem dispatchType: kotlin/Int @@ -743,6 +780,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Long + annotationClassIds: [kotlin/SinceKotlin] annotations: [kotlin/SinceKotlin(version = 1.1)] callableIdIfNonLocal: kotlin.Int.rem dispatchType: kotlin/Int @@ -763,6 +801,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [kotlin/SinceKotlin] annotations: [kotlin/SinceKotlin(version = 1.1)] callableIdIfNonLocal: kotlin.Int.rem dispatchType: kotlin/Int @@ -783,6 +822,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.shl dispatchType: kotlin/Int @@ -803,6 +843,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.shr dispatchType: kotlin/Int @@ -823,6 +864,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.times dispatchType: kotlin/Int @@ -843,6 +885,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Double + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.times dispatchType: kotlin/Int @@ -863,6 +906,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Float + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.times dispatchType: kotlin/Int @@ -883,6 +927,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.times dispatchType: kotlin/Int @@ -903,6 +948,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Long + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.times dispatchType: kotlin/Int @@ -923,6 +969,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.times dispatchType: kotlin/Int @@ -943,6 +990,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Byte + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.toByte dispatchType: kotlin/Int @@ -963,6 +1011,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Char + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.toChar dispatchType: kotlin/Int @@ -983,6 +1032,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Double + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.toDouble dispatchType: kotlin/Int @@ -1003,6 +1053,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Float + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.toFloat dispatchType: kotlin/Int @@ -1023,6 +1074,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.toInt dispatchType: kotlin/Int @@ -1043,6 +1095,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Long + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.toLong dispatchType: kotlin/Int @@ -1063,6 +1116,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Short + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.toShort dispatchType: kotlin/Int @@ -1083,6 +1137,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.unaryMinus dispatchType: kotlin/Int @@ -1103,6 +1158,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.unaryPlus dispatchType: kotlin/Int @@ -1123,6 +1179,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.ushr dispatchType: kotlin/Int @@ -1143,6 +1200,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.xor dispatchType: kotlin/Int @@ -1163,6 +1221,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.equals dispatchType: kotlin/Int @@ -1183,6 +1242,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.hashCode dispatchType: kotlin/Int @@ -1203,6 +1263,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/String + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.Int.toString dispatchType: kotlin/Int @@ -1222,6 +1283,7 @@ KtFirFunctionSymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: kotlin/Int.Companion classKind: COMPANION_OBJECT diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt index 6edef5f01d5..e94116ba572 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.txt @@ -3,6 +3,7 @@ class: kotlin/collections/MutableList // SYMBOLS: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.add dispatchType: kotlin/collections/MutableList @@ -23,6 +24,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Unit + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.add dispatchType: kotlin/collections/MutableList @@ -43,6 +45,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.addAll dispatchType: kotlin/collections/MutableList @@ -63,6 +66,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.addAll dispatchType: kotlin/collections/MutableList @@ -83,6 +87,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Unit + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.clear dispatchType: kotlin/collections/MutableList @@ -103,6 +108,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/collections/MutableListIterator + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.listIterator dispatchType: kotlin/collections/MutableList @@ -123,6 +129,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/collections/MutableListIterator + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.listIterator dispatchType: kotlin/collections/MutableList @@ -143,6 +150,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.remove dispatchType: kotlin/collections/MutableList @@ -163,6 +171,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.removeAll dispatchType: kotlin/collections/MutableList @@ -183,6 +192,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] E + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.removeAt dispatchType: kotlin/collections/MutableList @@ -203,6 +213,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.retainAll dispatchType: kotlin/collections/MutableList @@ -223,6 +234,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] E + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.set dispatchType: kotlin/collections/MutableList @@ -243,6 +255,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/collections/MutableList + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.subList dispatchType: kotlin/collections/MutableList @@ -263,6 +276,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.contains dispatchType: kotlin/collections/MutableList @@ -283,6 +297,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.containsAll dispatchType: kotlin/collections/MutableList @@ -303,6 +318,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] E + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.get dispatchType: kotlin/collections/MutableList @@ -323,6 +339,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.indexOf dispatchType: kotlin/collections/MutableList @@ -343,6 +360,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.isEmpty dispatchType: kotlin/collections/MutableList @@ -363,6 +381,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/collections/MutableIterator + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.iterator dispatchType: kotlin/collections/MutableList @@ -383,6 +402,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.lastIndexOf dispatchType: kotlin/collections/MutableList @@ -403,6 +423,7 @@ KtFirFunctionSymbol: KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.List.size dispatchType: kotlin/collections/MutableList @@ -426,6 +447,7 @@ KtFirKotlinPropertySymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.equals dispatchType: kotlin/collections/MutableList @@ -446,6 +468,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.hashCode dispatchType: kotlin/collections/MutableList @@ -466,6 +489,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/String + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.MutableList.toString dispatchType: kotlin/collections/MutableList diff --git a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt index aab31794f51..88cb246a1f1 100644 --- a/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt +++ b/idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.txt @@ -23,6 +23,7 @@ KtFirJavaFieldSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.hash32 dispatchType: java/lang/String @@ -53,6 +54,7 @@ KtFirJavaFieldSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.length dispatchType: java/lang/String @@ -73,6 +75,7 @@ KtFirFunctionSymbol: KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.CharSequence.length dispatchType: kotlin/CharSequence @@ -96,6 +99,7 @@ KtFirKotlinPropertySymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.isEmpty dispatchType: java/lang/String @@ -116,6 +120,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Char + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.charAt dispatchType: java/lang/String @@ -136,6 +141,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.codePointAt dispatchType: java/lang/String @@ -156,6 +162,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.codePointBefore dispatchType: java/lang/String @@ -176,6 +183,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.codePointCount dispatchType: java/lang/String @@ -196,6 +204,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.offsetByCodePoints dispatchType: java/lang/String @@ -216,6 +225,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Unit + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.getChars dispatchType: java/lang/String @@ -236,6 +246,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Unit + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.getChars dispatchType: java/lang/String @@ -256,6 +267,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Unit + annotationClassIds: [kotlin/Deprecated] annotations: [kotlin/Deprecated(message = Deprecated in Java)] callableIdIfNonLocal: java.lang.String.getBytes dispatchType: java/lang/String @@ -276,6 +288,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/ByteArray + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.getBytes dispatchType: java/lang/String @@ -296,6 +309,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/ByteArray + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.getBytes dispatchType: java/lang/String @@ -316,6 +330,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/ByteArray + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.getBytes dispatchType: java/lang/String @@ -336,6 +351,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.equals dispatchType: java/lang/String @@ -356,6 +372,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.contentEquals dispatchType: java/lang/String @@ -376,6 +393,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.contentEquals dispatchType: java/lang/String @@ -396,6 +414,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.equalsIgnoreCase dispatchType: java/lang/String @@ -416,6 +435,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.compareTo dispatchType: java/lang/String @@ -436,6 +456,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.compareToIgnoreCase dispatchType: java/lang/String @@ -456,6 +477,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.regionMatches dispatchType: java/lang/String @@ -476,6 +498,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.regionMatches dispatchType: java/lang/String @@ -496,6 +519,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.startsWith dispatchType: java/lang/String @@ -516,6 +540,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.startsWith dispatchType: java/lang/String @@ -536,6 +561,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.endsWith dispatchType: java/lang/String @@ -556,6 +582,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.hashCode dispatchType: java/lang/String @@ -576,6 +603,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.indexOf dispatchType: java/lang/String @@ -596,6 +624,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.indexOf dispatchType: java/lang/String @@ -616,6 +645,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.indexOf dispatchType: java/lang/String @@ -636,6 +666,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.indexOf dispatchType: java/lang/String @@ -656,6 +687,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.indexOfSupplementary dispatchType: java/lang/String @@ -676,6 +708,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.lastIndexOf dispatchType: java/lang/String @@ -696,6 +729,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.lastIndexOf dispatchType: java/lang/String @@ -716,6 +750,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.lastIndexOf dispatchType: java/lang/String @@ -736,6 +771,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.lastIndexOf dispatchType: java/lang/String @@ -756,6 +792,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.lastIndexOfSupplementary dispatchType: java/lang/String @@ -776,6 +813,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.substring dispatchType: java/lang/String @@ -796,6 +834,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.substring dispatchType: java/lang/String @@ -816,6 +855,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/CharSequence + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.subSequence dispatchType: java/lang/String @@ -836,6 +876,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.concat dispatchType: java/lang/String @@ -856,6 +897,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.replace dispatchType: java/lang/String @@ -876,6 +918,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.replace dispatchType: java/lang/String @@ -896,6 +939,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.matches dispatchType: java/lang/String @@ -916,6 +960,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Boolean + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.contains dispatchType: java/lang/String @@ -936,6 +981,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.replaceFirst dispatchType: java/lang/String @@ -956,6 +1002,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.replaceAll dispatchType: java/lang/String @@ -976,6 +1023,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] ft<@EnhancedNullability kotlin/Array!>, @EnhancedNullability kotlin/Array!>> + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.split dispatchType: java/lang/String @@ -996,6 +1044,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] ft<@EnhancedNullability kotlin/Array!>, @EnhancedNullability kotlin/Array!>> + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.split dispatchType: java/lang/String @@ -1016,6 +1065,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.toLowerCase dispatchType: java/lang/String @@ -1036,6 +1086,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.toLowerCase dispatchType: java/lang/String @@ -1056,6 +1107,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.toUpperCase dispatchType: java/lang/String @@ -1076,6 +1128,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.toUpperCase dispatchType: java/lang/String @@ -1096,6 +1149,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.trim dispatchType: java/lang/String @@ -1116,6 +1170,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @FlexibleNullability kotlin/String + annotationClassIds: [] annotations: [] callableIdIfNonLocal: java.lang.String.toString dispatchType: java/lang/String @@ -1136,6 +1191,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/CharArray + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.toCharArray dispatchType: java/lang/String @@ -1156,6 +1212,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] @EnhancedNullability kotlin/String + annotationClassIds: [org/jetbrains/annotations/NotNull] annotations: [org/jetbrains/annotations/NotNull()] callableIdIfNonLocal: java.lang.String.intern dispatchType: java/lang/String @@ -1214,6 +1271,7 @@ KtFirClassOrObjectSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1226,6 +1284,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1238,6 +1297,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1250,6 +1310,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1262,6 +1323,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1274,6 +1336,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [kotlin/Deprecated] annotations: [kotlin/Deprecated(message = Deprecated in Java)] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1286,6 +1349,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [kotlin/Deprecated] annotations: [kotlin/Deprecated(message = Deprecated in Java)] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1298,6 +1362,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1310,6 +1375,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1322,6 +1388,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1334,6 +1401,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1346,6 +1414,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1358,6 +1427,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1370,6 +1440,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1382,6 +1453,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1394,6 +1466,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: java/lang/String dispatchType: null @@ -1406,6 +1479,7 @@ KtFirConstructorSymbol: KtFirConstructorSymbol: annotatedType: [] java/lang/String + annotationClassIds: [kotlin/Deprecated] annotations: [kotlin/Deprecated(message = Deprecated in Java)] containingClassIdIfNonLocal: java/lang/String dispatchType: null diff --git a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/class.txt b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/class.txt index 11e8d1b8076..cbb5722231c 100644 --- a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/class.txt +++ b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/class.txt @@ -4,6 +4,7 @@ class: kotlin/Lazy // SYMBOLS: KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: kotlin/Lazy classKind: INTERFACE diff --git a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/classFromJdk.txt b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/classFromJdk.txt index 316aa0d412b..778cee11a20 100644 --- a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/classFromJdk.txt +++ b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/classFromJdk.txt @@ -4,6 +4,7 @@ class: java/lang/String // SYMBOLS: KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: java/lang/String classKind: CLASS diff --git a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunction.txt b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunction.txt index 6758dd21f39..eff23d693cc 100644 --- a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunction.txt +++ b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunction.txt @@ -3,6 +3,7 @@ callable: kotlin/collections/List.get // SYMBOLS: KtFirFunctionSymbol: annotatedType: [] E + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.List.get dispatchType: kotlin/collections/List diff --git a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunctionWithOverloads.txt b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunctionWithOverloads.txt index 26ed2902730..69fc5b3c7aa 100644 --- a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunctionWithOverloads.txt +++ b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunctionWithOverloads.txt @@ -3,6 +3,7 @@ callable: kotlin/collections/List.listIterator // SYMBOLS: KtFirFunctionSymbol: annotatedType: [] kotlin/collections/ListIterator + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.List.listIterator dispatchType: kotlin/collections/List @@ -23,6 +24,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/collections/ListIterator + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.List.listIterator dispatchType: kotlin/collections/List diff --git a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/nestedClass.txt b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/nestedClass.txt index 1842d61fa43..4549023cd05 100644 --- a/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/nestedClass.txt +++ b/idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/nestedClass.txt @@ -2,6 +2,7 @@ class: kotlin/collections/MutableMap.MutableEntry // SYMBOLS: KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: kotlin/collections/MutableMap.MutableEntry classKind: INTERFACE diff --git a/idea/idea-frontend-fir/testData/symbolPointer/class.kt b/idea/idea-frontend-fir/testData/symbolPointer/class.kt index e07d0c4a014..1c39d2f627b 100644 --- a/idea/idea-frontend-fir/testData/symbolPointer/class.kt +++ b/idea/idea-frontend-fir/testData/symbolPointer/class.kt @@ -3,6 +3,7 @@ class A { // SYMBOLS: KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: A classKind: CLASS diff --git a/idea/idea-frontend-fir/testData/symbolPointer/classPrimaryConstructor.kt b/idea/idea-frontend-fir/testData/symbolPointer/classPrimaryConstructor.kt index afd6ed56a86..028bb05d940 100644 --- a/idea/idea-frontend-fir/testData/symbolPointer/classPrimaryConstructor.kt +++ b/idea/idea-frontend-fir/testData/symbolPointer/classPrimaryConstructor.kt @@ -4,6 +4,7 @@ class A() { // SYMBOLS: KtFirConstructorSymbol: annotatedType: [] A + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: A dispatchType: null @@ -15,6 +16,7 @@ KtFirConstructorSymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: A classKind: CLASS diff --git a/idea/idea-frontend-fir/testData/symbolPointer/classSecondaryConstructors.kt b/idea/idea-frontend-fir/testData/symbolPointer/classSecondaryConstructors.kt index c40b28edf69..70f20220781 100644 --- a/idea/idea-frontend-fir/testData/symbolPointer/classSecondaryConstructors.kt +++ b/idea/idea-frontend-fir/testData/symbolPointer/classSecondaryConstructors.kt @@ -6,6 +6,7 @@ class A() { // SYMBOLS: KtFirConstructorSymbol: annotatedType: [] A + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: A dispatchType: null @@ -18,6 +19,7 @@ KtFirConstructorSymbol: KtFirFunctionValueParameterSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] hasDefaultValue: false isVararg: false @@ -27,6 +29,7 @@ KtFirFunctionValueParameterSymbol: KtFirConstructorSymbol: annotatedType: [] A + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: A dispatchType: null @@ -39,6 +42,7 @@ KtFirConstructorSymbol: KtFirFunctionValueParameterSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] hasDefaultValue: false isVararg: false @@ -48,6 +52,7 @@ KtFirFunctionValueParameterSymbol: KtFirFunctionValueParameterSymbol: annotatedType: [] kotlin/String + annotationClassIds: [] annotations: [] hasDefaultValue: false isVararg: false @@ -57,6 +62,7 @@ KtFirFunctionValueParameterSymbol: KtFirConstructorSymbol: annotatedType: [] A + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: A dispatchType: null @@ -68,6 +74,7 @@ KtFirConstructorSymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: A classKind: CLASS diff --git a/idea/idea-frontend-fir/testData/symbolPointer/enum.kt b/idea/idea-frontend-fir/testData/symbolPointer/enum.kt index dbe3d999397..326e30d45f0 100644 --- a/idea/idea-frontend-fir/testData/symbolPointer/enum.kt +++ b/idea/idea-frontend-fir/testData/symbolPointer/enum.kt @@ -18,6 +18,7 @@ KtFirEnumEntrySymbol: symbolKind: MEMBER KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: X classKind: ENUM_CLASS diff --git a/idea/idea-frontend-fir/testData/symbolPointer/memberFunctions.kt b/idea/idea-frontend-fir/testData/symbolPointer/memberFunctions.kt index cad83c89298..f952812ebb9 100644 --- a/idea/idea-frontend-fir/testData/symbolPointer/memberFunctions.kt +++ b/idea/idea-frontend-fir/testData/symbolPointer/memberFunctions.kt @@ -6,6 +6,7 @@ class A { // SYMBOLS: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: A.x dispatchType: A @@ -26,6 +27,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Unit + annotationClassIds: [] annotations: [] callableIdIfNonLocal: A.y dispatchType: A @@ -45,6 +47,7 @@ KtFirFunctionSymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: A classKind: CLASS diff --git a/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt b/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt index f4e6fb3f5e5..1978a2180fa 100644 --- a/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt +++ b/idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt @@ -6,6 +6,7 @@ class A { // SYMBOLS: KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: A.x dispatchType: A @@ -29,6 +30,7 @@ KtFirKotlinPropertySymbol: KtFirPropertyGetterSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] dispatchType: null hasBody: true @@ -42,6 +44,7 @@ KtFirPropertyGetterSymbol: KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: A.y dispatchType: A @@ -64,6 +67,7 @@ KtFirKotlinPropertySymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: A classKind: CLASS diff --git a/idea/idea-frontend-fir/testData/symbolPointer/topLevelFunctions.kt b/idea/idea-frontend-fir/testData/symbolPointer/topLevelFunctions.kt index 074f7d70e36..6a6af8012fc 100644 --- a/idea/idea-frontend-fir/testData/symbolPointer/topLevelFunctions.kt +++ b/idea/idea-frontend-fir/testData/symbolPointer/topLevelFunctions.kt @@ -4,6 +4,7 @@ fun y() {} // SYMBOLS: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: x dispatchType: null @@ -24,6 +25,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Unit + annotationClassIds: [] annotations: [] callableIdIfNonLocal: y dispatchType: null diff --git a/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt b/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt index 44f9b23d5c7..baa16ea7dde 100644 --- a/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt +++ b/idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt @@ -4,6 +4,7 @@ val Int.y get() = this // SYMBOLS: KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: x dispatchType: null @@ -27,6 +28,7 @@ KtFirKotlinPropertySymbol: KtFirPropertyGetterSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] dispatchType: null hasBody: true @@ -40,6 +42,7 @@ KtFirPropertyGetterSymbol: KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: y dispatchType: null diff --git a/idea/idea-frontend-fir/testData/symbolsByFqName/fileWalkDirectionEnum.txt b/idea/idea-frontend-fir/testData/symbolsByFqName/fileWalkDirectionEnum.txt index c68d73154f3..f948399b035 100644 --- a/idea/idea-frontend-fir/testData/symbolsByFqName/fileWalkDirectionEnum.txt +++ b/idea/idea-frontend-fir/testData/symbolsByFqName/fileWalkDirectionEnum.txt @@ -3,6 +3,7 @@ callable: kotlin/collections/listOf // SYMBOLS: KtFirFunctionSymbol: annotatedType: [] kotlin/collections/List + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.listOf dispatchType: null @@ -23,6 +24,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/collections/List + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.listOf dispatchType: null @@ -43,6 +45,7 @@ KtFirFunctionSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/collections/List + annotationClassIds: [] annotations: [] callableIdIfNonLocal: kotlin.collections.listOf dispatchType: null diff --git a/idea/idea-frontend-fir/testData/symbolsByFqName/iterator.txt b/idea/idea-frontend-fir/testData/symbolsByFqName/iterator.txt index 7f4edabcd6a..95adf6bf81e 100644 --- a/idea/idea-frontend-fir/testData/symbolsByFqName/iterator.txt +++ b/idea/idea-frontend-fir/testData/symbolsByFqName/iterator.txt @@ -2,6 +2,7 @@ class: kotlin/collections/Iterator // SYMBOLS: KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: kotlin/collections/Iterator classKind: INTERFACE diff --git a/idea/idea-frontend-fir/testData/symbolsByFqName/listOf.txt b/idea/idea-frontend-fir/testData/symbolsByFqName/listOf.txt index 041c3a5d8da..d2a332230bc 100644 --- a/idea/idea-frontend-fir/testData/symbolsByFqName/listOf.txt +++ b/idea/idea-frontend-fir/testData/symbolsByFqName/listOf.txt @@ -2,6 +2,7 @@ class: kotlin/io/FileWalkDirection // SYMBOLS: KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: kotlin/io/FileWalkDirection classKind: ENUM_CLASS diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/annotations.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/annotations.kt index 596fa5b6665..75d2cb5e832 100644 --- a/idea/idea-frontend-fir/testData/symbolsByPsi/annotations.kt +++ b/idea/idea-frontend-fir/testData/symbolsByPsi/annotations.kt @@ -13,6 +13,7 @@ class X { /* KtFirFunctionValueParameterSymbol: annotatedType: [] kotlin/String + annotationClassIds: [] annotations: [] hasDefaultValue: false isVararg: false @@ -22,6 +23,7 @@ KtFirFunctionValueParameterSymbol: KtFirFunctionValueParameterSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] hasDefaultValue: false isVararg: false @@ -31,6 +33,7 @@ KtFirFunctionValueParameterSymbol: KtFirConstructorSymbol: annotatedType: [] Anno + annotationClassIds: [] annotations: [] containingClassIdIfNonLocal: Anno dispatchType: null @@ -42,6 +45,7 @@ KtFirConstructorSymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: Anno classKind: ANNOTATION_CLASS @@ -61,6 +65,7 @@ KtFirClassOrObjectSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Unit + annotationClassIds: [Anno] annotations: [Anno(param1 = funparam, param2 = 3)] callableIdIfNonLocal: X.x dispatchType: X @@ -80,6 +85,7 @@ KtFirFunctionSymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [Anno] annotations: [Anno(param1 = param, param2 = 2)] classIdIfNonLocal: X classKind: CLASS diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/anonymousObject.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/anonymousObject.kt index 3aab73080f1..352cb80b171 100644 --- a/idea/idea-frontend-fir/testData/symbolsByPsi/anonymousObject.kt +++ b/idea/idea-frontend-fir/testData/symbolsByPsi/anonymousObject.kt @@ -11,6 +11,7 @@ class AnonymousContainer { /* KtFirFunctionSymbol: annotatedType: [] kotlin/Unit + annotationClassIds: [] annotations: [] callableIdIfNonLocal: .run dispatchType: @@ -31,6 +32,7 @@ KtFirFunctionSymbol: KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: .data dispatchType: @@ -53,6 +55,7 @@ KtFirKotlinPropertySymbol: visibility: PUBLIC KtFirAnonymousObjectSymbol: + annotationClassIds: [] annotations: [] origin: SOURCE superTypes: [[] java/lang/Runnable] @@ -60,6 +63,7 @@ KtFirAnonymousObjectSymbol: KtFirKotlinPropertySymbol: annotatedType: [] java/lang/Runnable + annotationClassIds: [] annotations: [] callableIdIfNonLocal: AnonymousContainer.anonymousObject dispatchType: AnonymousContainer @@ -82,6 +86,7 @@ KtFirKotlinPropertySymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: AnonymousContainer classKind: CLASS diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/class.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/class.kt index bd41d19c2d9..e0f22d99d75 100644 --- a/idea/idea-frontend-fir/testData/symbolsByPsi/class.kt +++ b/idea/idea-frontend-fir/testData/symbolsByPsi/class.kt @@ -4,6 +4,7 @@ class A { // SYMBOLS: /* KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: A classKind: CLASS diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt index 13ed397fa28..1a3732d37a0 100644 --- a/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt +++ b/idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt @@ -7,6 +7,7 @@ class A { /* KtFirKotlinPropertySymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: A.a dispatchType: A @@ -30,6 +31,7 @@ KtFirKotlinPropertySymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: A.x dispatchType: A @@ -49,6 +51,7 @@ KtFirFunctionSymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: A classKind: CLASS diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/classWithTypeParams.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/classWithTypeParams.kt index 306778a29b5..e9c47437e19 100644 --- a/idea/idea-frontend-fir/testData/symbolsByPsi/classWithTypeParams.kt +++ b/idea/idea-frontend-fir/testData/symbolsByPsi/classWithTypeParams.kt @@ -18,6 +18,7 @@ KtFirTypeParameterSymbol: variance: INVARIANT KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: A classKind: CLASS diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/extensionFunction.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/extensionFunction.kt index a7d9de92c96..2a45d83940f 100644 --- a/idea/idea-frontend-fir/testData/symbolsByPsi/extensionFunction.kt +++ b/idea/idea-frontend-fir/testData/symbolsByPsi/extensionFunction.kt @@ -4,6 +4,7 @@ fun String.foo(): Int = 10 /* KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: foo dispatchType: null diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/function.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/function.kt index 162823828f4..2022cb53001 100644 --- a/idea/idea-frontend-fir/testData/symbolsByPsi/function.kt +++ b/idea/idea-frontend-fir/testData/symbolsByPsi/function.kt @@ -4,6 +4,7 @@ fun foo(x: Int) {} /* KtFirFunctionValueParameterSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] hasDefaultValue: false isVararg: false @@ -13,6 +14,7 @@ KtFirFunctionValueParameterSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Unit + annotationClassIds: [] annotations: [] callableIdIfNonLocal: foo dispatchType: null diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt index 1a63291d805..9e1457bd5ef 100644 --- a/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt +++ b/idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt @@ -11,6 +11,7 @@ KtFirTypeParameterSymbol: KtFirFunctionValueParameterSymbol: annotatedType: [] X + annotationClassIds: [] annotations: [] hasDefaultValue: false isVararg: false @@ -20,6 +21,7 @@ KtFirFunctionValueParameterSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Unit + annotationClassIds: [] annotations: [] callableIdIfNonLocal: foo dispatchType: null diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/implicitReturn.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/implicitReturn.kt index 55b27d27cc7..919b7873366 100644 --- a/idea/idea-frontend-fir/testData/symbolsByPsi/implicitReturn.kt +++ b/idea/idea-frontend-fir/testData/symbolsByPsi/implicitReturn.kt @@ -4,6 +4,7 @@ fun foo(): Int = 10 /* KtFirFunctionSymbol: annotatedType: [] kotlin/Int + annotationClassIds: [] annotations: [] callableIdIfNonLocal: foo dispatchType: null diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/localDeclarations.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/localDeclarations.kt index 31298cff773..4021982a9e3 100644 --- a/idea/idea-frontend-fir/testData/symbolsByPsi/localDeclarations.kt +++ b/idea/idea-frontend-fir/testData/symbolsByPsi/localDeclarations.kt @@ -16,6 +16,7 @@ KtFirLocalVariableSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Unit + annotationClassIds: [] annotations: [] callableIdIfNonLocal: null dispatchType: null @@ -35,6 +36,7 @@ KtFirFunctionSymbol: visibility: LOCAL KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: null classKind: CLASS @@ -54,6 +56,7 @@ KtFirClassOrObjectSymbol: KtFirFunctionSymbol: annotatedType: [] kotlin/Unit + annotationClassIds: [] annotations: [] callableIdIfNonLocal: yyy dispatchType: null diff --git a/idea/idea-frontend-fir/testData/symbolsByPsi/typeAnnotations.kt b/idea/idea-frontend-fir/testData/symbolsByPsi/typeAnnotations.kt index 8b2d0de4c42..e5b12a2e826 100644 --- a/idea/idea-frontend-fir/testData/symbolsByPsi/typeAnnotations.kt +++ b/idea/idea-frontend-fir/testData/symbolsByPsi/typeAnnotations.kt @@ -18,6 +18,7 @@ class X : @Anno1 I { // SYMBOLS: /* KtFirClassOrObjectSymbol: + annotationClassIds: [kotlin/annotation/Target] annotations: [kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)] classIdIfNonLocal: Anno1 classKind: ANNOTATION_CLASS @@ -36,6 +37,7 @@ KtFirClassOrObjectSymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [kotlin/annotation/Target] annotations: [kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)] classIdIfNonLocal: Anno2 classKind: ANNOTATION_CLASS @@ -54,6 +56,7 @@ KtFirClassOrObjectSymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [kotlin/annotation/Target] annotations: [kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)] classIdIfNonLocal: Anno3 classKind: ANNOTATION_CLASS @@ -72,6 +75,7 @@ KtFirClassOrObjectSymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [kotlin/annotation/Target] annotations: [kotlin/annotation/Target(allowedTargets = KtUnsupportedConstantValue)] classIdIfNonLocal: Anno4 classKind: ANNOTATION_CLASS @@ -90,6 +94,7 @@ KtFirClassOrObjectSymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: I classKind: INTERFACE @@ -109,6 +114,7 @@ KtFirClassOrObjectSymbol: KtFirFunctionValueParameterSymbol: annotatedType: [Anno2()] I + annotationClassIds: [] annotations: [] hasDefaultValue: false isVararg: false @@ -118,6 +124,7 @@ KtFirFunctionValueParameterSymbol: KtFirFunctionSymbol: annotatedType: [Anno3()] I + annotationClassIds: [] annotations: [] callableIdIfNonLocal: X.f dispatchType: X @@ -138,6 +145,7 @@ KtFirFunctionSymbol: KtFirKotlinPropertySymbol: annotatedType: [Anno4()] I + annotationClassIds: [] annotations: [] callableIdIfNonLocal: X.x dispatchType: X @@ -160,6 +168,7 @@ KtFirKotlinPropertySymbol: visibility: PUBLIC KtFirClassOrObjectSymbol: + annotationClassIds: [] annotations: [] classIdIfNonLocal: X classKind: CLASS