[FIR] get rid of FirFileAnnotationsContainer

This element has been introduced to simplify resolution logic in LL FIR,
but now this element is redundant and only complicates the code as after
KT-56683 `FirFile` has real phases

^KT-65876 Fixed
This commit is contained in:
Dmitrii Gridin
2024-02-20 00:38:31 +01:00
committed by Space Team
parent 24c91bbf56
commit 17c128adf2
55 changed files with 109 additions and 484 deletions
@@ -457,15 +457,6 @@ abstract class FirAbstractBodyResolveTransformerDispatcher(
FirDeclarationsResolveTransformer::transformDanglingModifierList,
)
override fun transformFileAnnotationsContainer(
fileAnnotationsContainer: FirFileAnnotationsContainer,
data: ResolutionMode,
): FirFileAnnotationsContainer = declarationTransformation(
fileAnnotationsContainer,
data,
FirDeclarationsResolveTransformer::transformFileAnnotationsContainer,
)
override fun transformProperty(
property: FirProperty,
data: ResolutionMode,
@@ -125,16 +125,6 @@ open class FirDeclarationsResolveTransformer(
return danglingModifierList
}
override fun transformFileAnnotationsContainer(
fileAnnotationsContainer: FirFileAnnotationsContainer,
data: ResolutionMode
): FirFileAnnotationsContainer {
if (implicitTypeOnly) return fileAnnotationsContainer
fileAnnotationsContainer.transformAnnotations(transformer, data)
return fileAnnotationsContainer
}
override fun transformProperty(property: FirProperty, data: ResolutionMode): FirProperty = whileAnalysing(session, property) {
require(property !is FirSyntheticProperty) { "Synthetic properties should not be processed by body transformers" }
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.fir.resolve.transformers.contracts
import org.jetbrains.kotlin.KtFakeSourceElementKind
import org.jetbrains.kotlin.fir.FirFileAnnotationsContainer
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.contracts.FirLegacyRawContractDescription
import org.jetbrains.kotlin.fir.contracts.FirRawContractDescription
@@ -327,13 +326,6 @@ abstract class FirAbstractContractResolveTransformerDispatcher(
return danglingModifierList
}
override fun transformFileAnnotationsContainer(
fileAnnotationsContainer: FirFileAnnotationsContainer,
data: ResolutionMode
): FirFileAnnotationsContainer {
return fileAnnotationsContainer
}
override fun transformErrorPrimaryConstructor(
errorPrimaryConstructor: FirErrorPrimaryConstructor,
data: ResolutionMode,