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

[AA FIR] annotationClassIds should return fully-expanded classIds

Browse Source 
^KT-56046
This commit is contained in:
Dmitrii Gridin
2023-01-25 14:47:46 +01:00
committed by Space Team
parent 11a0771a3d
commit 2c7fb49a80
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForDeclaration.kt
+1 -1
View File
@@ -43,7 +43,7 @@ internal class KtFirAnnotationListForDeclaration private constructor(
override val annotationClassIds: Collection<ClassId>
get() = withValidityAssertion {
annotationClassIds(firSymbol)
annotationClassIds(firSymbol, useSiteSession)
}
companion object {
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/KtFirAnnotationListForReceiverParameter.kt
+1 -1
View File
@@ -46,7 +46,7 @@ internal class KtFirAnnotationListForReceiverParameter private constructor(
override val annotationClassIds: Collection<ClassId>
get() = withValidityAssertion {
annotationClassIds(firCallableSymbol, receiverParameter)
annotationClassIds(firCallableSymbol, useSiteSession, receiverParameter)
}
companion object {
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/annotations/firAnnotationUtils.kt
+8 -2
View File
@@ -19,7 +19,10 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
import org.jetbrains.kotlin.fir.expressions.FirExpression
import org.jetbrains.kotlin.fir.expressions.arguments
import org.jetbrains.kotlin.fir.resolve.transformers.plugin.CompilerRequiredAnnotationsHelper
import org.jetbrains.kotlin.fir.symbols.*
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
import org.jetbrains.kotlin.fir.symbols.resolvedAnnotationsWithArguments
import org.jetbrains.kotlin.fir.symbols.resolvedAnnotationsWithClassIds
import org.jetbrains.kotlin.fir.symbols.resolvedCompilerRequiredAnnotations
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.Name
@@ -63,8 +66,11 @@ internal fun annotations(
internal fun annotationClassIds(
firSymbol: FirBasedSymbol<*>,
useSiteSession: FirSession,
annotationContainer: FirAnnotationContainer = firSymbol.fir,
): Collection<ClassId> = annotationContainer.resolvedAnnotationClassIds(firSymbol)
): Collection<ClassId> = annotationContainer.resolvedAnnotationsWithClassIds(firSymbol).mapNotNull {
it.toAnnotationClassId(useSiteSession)
}
internal fun hasAnnotation(
firSymbol: FirBasedSymbol<*>,