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

[LL API] Ignore annotation arguments in 'ContextCollector'

Browse Source
This commit is contained in:
Yan Zhulanow
2023-08-04 18:09:39 +09:00
committed by Space Team
parent 4fbbe9f274
commit b76a388e35
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/util/ContextCollector.kt
+11 -12
View File
@@ -193,8 +193,6 @@ private class ContextCollectorVisitor(
}
override fun visitFile(file: FirFile) {
file.lazyResolveToPhase(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING)
context.withFile(file, holder) {
withInterceptor {
super.visitFile(file)
@@ -203,19 +201,25 @@ private class ContextCollectorVisitor(
}
override fun visitAnnotationCall(annotationCall: FirAnnotationCall) {
dumpContext(annotationCall.psi, ContextKind.SELF)
context.forAnnotation {
super.visitAnnotationCall(annotationCall)
dumpContext(annotationCall.psi, ContextKind.BODY)
// Technically, annotation arguments might contain arbitrary expressions.
// However, such cases are very rare, as it's currently forbidden in Kotlin.
// Here we ignore declarations that might be inside such expressions, avoiding unnecessary tree traversal.
}
}
override fun visitRegularClass(regularClass: FirRegularClass) = withProcessor {
dumpContext(regularClass.psi, ContextKind.SELF)
regularClass.lazyResolveToPhase(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING)
processSignatureAnnotations(regularClass)
context.withContainingClass(regularClass) {
regularClass.lazyResolveToPhase(FirResolvePhase.STATUS)
processList(regularClass.typeParameters)
context.withRegularClass(regularClass, holder) {
@@ -237,11 +241,11 @@ private class ContextCollectorVisitor(
override fun visitConstructor(constructor: FirConstructor) = withProcessor {
dumpContext(constructor.psi, ContextKind.SELF)
constructor.lazyResolveToPhase(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING)
processSignatureAnnotations(constructor)
context.withConstructor(constructor) {
constructor.lazyResolveToPhase(FirResolvePhase.BODY_RESOLVE)
val owningClass = context.containerIfAny as? FirRegularClass
context.forConstructorParameters(constructor, owningClass, holder) {
processList(constructor.valueParameters)
@@ -253,7 +257,6 @@ private class ContextCollectorVisitor(
dumpContext(constructor.psi, ContextKind.BODY)
onActive {
constructor.lazyResolveToPhase(FirResolvePhase.BODY_RESOLVE)
process(constructor.body)
}
}
@@ -305,8 +308,6 @@ private class ContextCollectorVisitor(
override fun visitProperty(property: FirProperty) = withProcessor {
dumpContext(property.psi, ContextKind.SELF)
property.lazyResolveToPhase(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING)
processSignatureAnnotations(property)
onActive {
@@ -369,8 +370,6 @@ private class ContextCollectorVisitor(
override fun visitAnonymousInitializer(anonymousInitializer: FirAnonymousInitializer) = withProcessor {
dumpContext(anonymousInitializer.psi, ContextKind.SELF)
anonymousInitializer.lazyResolveToPhase(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING)
processSignatureAnnotations(anonymousInitializer)
context.withAnonymousInitializer(anonymousInitializer, session) {