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

[FIR] rename ANNOTATIONS_ARGUMENTS_MAPPING phase to ANNOTATION_ARGUMENTS

Browse Source 
^KT-62679
This commit is contained in:
Dmitrii Gridin
2023-10-18 18:16:56 +02:00
committed by Space Team
parent a86bae2c32
commit 3817f37011
483 changed files with 1021 additions and 1023 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTotalResolveProcessor.kt
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Copyright 2010-2023 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.
*/
@@ -84,7 +84,7 @@ fun FirResolvePhase.createCompilerProcessorByPhase(
STATUS -> FirStatusResolveProcessor(session, scopeSession)
CONTRACTS -> FirContractResolveProcessor(session, scopeSession)
IMPLICIT_TYPES_BODY_RESOLVE -> FirImplicitTypeBodyResolveProcessor(session, scopeSession)
ANNOTATIONS_ARGUMENTS_MAPPING -> FirAnnotationArgumentsMappingProcessor(session, scopeSession)
ANNOTATION_ARGUMENTS -> FirAnnotationArgumentsProcessor(session, scopeSession)
BODY_RESOLVE -> FirBodyResolveProcessor(session, scopeSession)
EXPECT_ACTUAL_MATCHING -> FirExpectActualMatcherProcessor(session, scopeSession)
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsMappingProcessor.kt → compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsProcessor.kt
+5 -5
View File
@@ -17,16 +17,16 @@ import org.jetbrains.kotlin.fir.visitors.FirTransformer
import org.jetbrains.kotlin.fir.withFileAnalysisExceptionWrapping
@OptIn(AdapterForResolveProcessor::class)
class FirAnnotationArgumentsMappingProcessor(
class FirAnnotationArgumentsProcessor(
session: FirSession,
scopeSession: ScopeSession
) : FirTransformerBasedResolveProcessor(session, scopeSession, FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING) {
override val transformer: FirTransformer<Any?> = FirAnnotationArgumentsMappingTransformerAdapter(session, scopeSession)
) : FirTransformerBasedResolveProcessor(session, scopeSession, FirResolvePhase.ANNOTATION_ARGUMENTS) {
override val transformer: FirTransformer<Any?> = FirAnnotationArgumentsTransformerAdapter(session, scopeSession)
}
@AdapterForResolveProcessor
class FirAnnotationArgumentsMappingTransformerAdapter(session: FirSession, scopeSession: ScopeSession) : FirTransformer<Any?>() {
private val transformer = FirAnnotationArgumentsMappingTransformer(session, scopeSession, FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING)
class FirAnnotationArgumentsTransformerAdapter(session: FirSession, scopeSession: ScopeSession) : FirTransformer<Any?>() {
private val transformer = FirAnnotationArgumentsTransformer(session, scopeSession, FirResolvePhase.ANNOTATION_ARGUMENTS)
override fun <E : FirElement> transformElement(element: E, data: Any?): E {
error("Should only be called via transformFile()")
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsMappingTransformer.kt → compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsTransformer.kt
+10 -12
View File
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.StandardClassIds
import org.jetbrains.kotlin.util.PrivateForInline
open class FirAnnotationArgumentsMappingTransformer(
open class FirAnnotationArgumentsTransformer(
session: FirSession,
scopeSession: ScopeSession,
resolvePhase: FirResolvePhase,
@@ -49,11 +49,9 @@ open class FirAnnotationArgumentsMappingTransformer(
returnTypeCalculator = returnTypeCalculator,
firResolveContextCollector = firResolveContextCollector,
) {
final override val expressionsTransformer: FirExpressionsResolveTransformer =
FirExpressionTransformerForAnnotationArgumentsMapping(this)
final override val expressionsTransformer: FirExpressionsResolveTransformer = FirExpressionTransformerForAnnotationArguments(this)
private val declarationsResolveTransformerForAnnotationArgumentsMapping =
FirDeclarationsResolveTransformerForAnnotationArgumentsMapping(this)
private val declarationsResolveTransformerForAnnotationArguments = FirDeclarationsResolveTransformerForAnnotationArguments(this)
private val usualDeclarationTransformer = FirDeclarationsResolveTransformer(this)
@@ -75,7 +73,7 @@ open class FirAnnotationArgumentsMappingTransformer(
final override val declarationsTransformer: FirDeclarationsResolveTransformer
get() {
return if (isInsideAnnotationArgument) usualDeclarationTransformer
else declarationsResolveTransformerForAnnotationArgumentsMapping
else declarationsResolveTransformerForAnnotationArguments
}
}
@@ -84,18 +82,18 @@ open class FirAnnotationArgumentsMappingTransformer(
*/
private val classIdsToCheck: Set<ClassId> = setOf(StandardClassIds.DeprecationLevel, StandardClassIds.AnnotationTarget)
private class FirExpressionTransformerForAnnotationArgumentsMapping(
private val annotationArgumentsMappingTransformer: FirAnnotationArgumentsMappingTransformer,
) : FirExpressionsResolveTransformer(annotationArgumentsMappingTransformer) {
private class FirExpressionTransformerForAnnotationArguments(
private val annotationArgumentsTransformer: FirAnnotationArgumentsTransformer,
) : FirExpressionsResolveTransformer(annotationArgumentsTransformer) {
override fun transformAnnotationCall(annotationCall: FirAnnotationCall, data: ResolutionMode): FirStatement {
annotationArgumentsMappingTransformer.insideAnnotationArgument {
annotationArgumentsTransformer.insideAnnotationArgument {
return super.transformAnnotationCall(annotationCall, data)
}
}
override fun transformErrorAnnotationCall(errorAnnotationCall: FirErrorAnnotationCall, data: ResolutionMode): FirStatement {
annotationArgumentsMappingTransformer.insideAnnotationArgument {
annotationArgumentsTransformer.insideAnnotationArgument {
return super.transformErrorAnnotationCall(errorAnnotationCall, data)
}
}
@@ -177,7 +175,7 @@ private class FirExpressionTransformerForAnnotationArgumentsMapping(
}
}
private class FirDeclarationsResolveTransformerForAnnotationArgumentsMapping(
private class FirDeclarationsResolveTransformerForAnnotationArguments(
transformer: FirAbstractBodyResolveTransformerDispatcher
) : FirDeclarationsResolveTransformer(transformer) {
override fun withFile(file: FirFile, action: () -> FirFile): FirFile {