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

[LL FIR] move common annotation transformation logic into LLFirAnnotationArgumentMappingLazyResolver

Browse Source 
^KT-62679
This commit is contained in:
Dmitrii Gridin
2023-10-18 14:53:03 +02:00
committed by Space Team
parent f5763cf34a
commit 01905a5a06
2 changed files with 53 additions and 45 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/transformers/LLFirAnnotationArgumentMappingLazyResolver.kt
+32
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.analysis.low.level.api.fir.transformers
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.targets.LLFirResolveTarget
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.throwUnexpectedFirElementError
import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirLockProvider
import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyBodiesCalculator
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.llFirSession
@@ -16,11 +17,13 @@ import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.expressions.builder.buildArgumentList
import org.jetbrains.kotlin.fir.expressions.impl.FirResolvedArgumentList
import org.jetbrains.kotlin.fir.references.isError
import org.jetbrains.kotlin.fir.resolve.ResolutionMode
import org.jetbrains.kotlin.fir.resolve.ScopeSession
import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirResolveContextCollector
import org.jetbrains.kotlin.fir.resolve.transformers.plugin.FirAnnotationArgumentsMappingTransformer
import org.jetbrains.kotlin.fir.types.FirTypeProjection
import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid
import org.jetbrains.kotlin.fir.visitors.transformSingle
internal object LLFirAnnotationArgumentMappingLazyResolver : LLFirLazyResolver(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING) {
override fun resolve(
@@ -73,8 +76,37 @@ private class LLFirAnnotationArgumentsMappingTargetResolver(
firClass
}
}
private fun transformAnnotations(target: FirElementWithResolveState) {
when {
target is FirRegularClass -> {
val declarationTransformer = transformer.declarationsTransformer
declarationTransformer.context.insideClassHeader {
target.transformAnnotations(declarationTransformer, ResolutionMode.ContextIndependent)
target.transformTypeParameters(declarationTransformer, ResolutionMode.ContextIndependent)
target.transformSuperTypeRefs(declarationTransformer, ResolutionMode.ContextIndependent)
}
}
target is FirScript -> target.transformAnnotations(transformer.declarationsTransformer, ResolutionMode.ContextIndependent)
target.isRegularDeclarationWithAnnotation -> target.transformSingle(transformer, ResolutionMode.ContextIndependent)
target is FirCodeFragment || target is FirFile -> {}
else -> throwUnexpectedFirElementError(target)
}
}
}
internal val FirElementWithResolveState.isRegularDeclarationWithAnnotation: Boolean
get() = when (this) {
is FirCallableDeclaration,
is FirAnonymousInitializer,
is FirDanglingModifierList,
is FirFileAnnotationsContainer,
is FirTypeAlias,
-> true
else -> false
}
internal object AnnotationArgumentMappingStateKeepers {
private val ANNOTATION: StateKeeper<FirAnnotation, FirSession> = stateKeeper { _, session ->
add(ANNOTATION_BASE, session)
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirAnnotationArgumentsLazyResolver.kt
+21 -45
View File
@@ -10,7 +10,6 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.api.throwUnexpectedFirEle
import org.jetbrains.kotlin.analysis.low.level.api.fir.file.builder.LLFirLockProvider
import org.jetbrains.kotlin.analysis.low.level.api.fir.lazy.resolve.FirLazyBodiesCalculator
import org.jetbrains.kotlin.fir.FirElementWithResolveState
import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.resolve.ResolutionMode
@@ -62,49 +61,26 @@ private class LLFirAnnotationArgumentsTargetResolver(
override fun doLazyResolveUnderLock(target: FirElementWithResolveState) {
FirLazyBodiesCalculator.calculateAnnotations(target)
transformAnnotations(target)
when {
target is FirRegularClass -> {
val declarationTransformer = transformer.declarationsTransformer
target.transformAnnotations(declarationTransformer, ResolutionMode.ContextIndependent)
target.transformTypeParameters(declarationTransformer, ResolutionMode.ContextIndependent)
target.transformSuperTypeRefs(declarationTransformer, ResolutionMode.ContextIndependent)
}
target is FirScript -> {
target.transformAnnotations(transformer.declarationsTransformer, ResolutionMode.ContextIndependent)
}
target.isRegularDeclarationWithAnnotation -> {
target.transformSingle(transformer, ResolutionMode.ContextIndependent)
}
target is FirCodeFragment || target is FirFile -> {}
else -> throwUnexpectedFirElementError(target)
}
}
}
internal fun LLFirAbstractBodyTargetResolver.transformAnnotations(target: FirElementWithResolveState) {
when {
target is FirRegularClass -> transformer.declarationsTransformer?.let { declarationsTransformer ->
if (this is LLFirAnnotationArgumentsTargetResolver) {
target.transformAnnotations(declarationsTransformer, ResolutionMode.ContextIndependent)
target.transformTypeParameters(declarationsTransformer, ResolutionMode.ContextIndependent)
target.transformSuperTypeRefs(declarationsTransformer, ResolutionMode.ContextIndependent)
} else {
declarationsTransformer.context.insideClassHeader {
target.transformAnnotations(declarationsTransformer, ResolutionMode.ContextIndependent)
target.transformTypeParameters(declarationsTransformer, ResolutionMode.ContextIndependent)
target.transformSuperTypeRefs(declarationsTransformer, ResolutionMode.ContextIndependent)
}
}
}
target is FirScript -> {
transformer.declarationsTransformer?.let {
target.transformAnnotations(it, ResolutionMode.ContextIndependent)
}
}
target.isRegularDeclarationWithAnnotation -> {
target.transformSingle(transformer, ResolutionMode.ContextIndependent)
}
target is FirCodeFragment || target is FirFile -> {}
else -> throwUnexpectedFirElementError(target)
}
}
internal val FirElementWithResolveState.isRegularDeclarationWithAnnotation: Boolean
get() = when (this) {
is FirCallableDeclaration,
is FirAnonymousInitializer,
is FirDanglingModifierList,
is FirFileAnnotationsContainer,
is FirTypeAlias,
-> true
else -> false
}