diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationArgumentsMappingTransformer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationArgumentsMappingTransformer.kt index 9d3c412a448..94776019cd3 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationArgumentsMappingTransformer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationArgumentsMappingTransformer.kt @@ -21,7 +21,6 @@ import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.resolve.ResolutionMode import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.plugin.FirAnnotationArgumentsMappingTransformer -import org.jetbrains.kotlin.fir.declarations.resolvePhase /** * Transform designation into ANNOTATIONS_ARGUMENTS_MAPPING declaration. Affects only for target declaration, it's children and dependents @@ -39,9 +38,6 @@ internal class LLFirDesignatedAnnotationArgumentsMappingTransformer( } override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { - if (designation.target.resolvePhase >= FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING) return - designation.target.checkPhase(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) - phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.ANNOTATIONS_ARGUMENTS_MAPPING) { FirLazyBodiesCalculator.calculateAnnotations(designation.firFile) designation.firFile.transform(this, ResolutionMode.ContextIndependent) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationArgumentsResolveTransformer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationArgumentsResolveTransformer.kt index fe3101b4f40..cbedbc1e049 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationArgumentsResolveTransformer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationArgumentsResolveTransformer.kt @@ -56,9 +56,6 @@ internal class LLFirDesignatedAnnotationArgumentsResolveTransformer( } override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { - if (designation.target.resolvePhase >= FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS) return - designation.target.checkPhase(FirResolvePhase.STATUS) - val designationIterator = designation.toSequenceWithFile(includeTarget = false).iterator() phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS) { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationsResolveTransformed.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationsResolveTransformed.kt index 01f7ef8ee97..105df463e86 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationsResolveTransformed.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedAnnotationsResolveTransformed.kt @@ -49,8 +49,6 @@ internal class LLFirDesignatedAnnotationsResolveTransformed( } override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { - if (designation.target.resolvePhase >= FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS) return - val designationIterator = designation.toSequenceWithFile(includeTarget = false).iterator() phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.COMPILER_REQUIRED_ANNOTATIONS) { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedBodyResolveTransformer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedBodyResolveTransformer.kt index af982f4f2bd..0d7fc108c3c 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedBodyResolveTransformer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedBodyResolveTransformer.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.resolve.ResolutionMode import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirBodyResolveTransformer @@ -51,9 +50,6 @@ internal class LLFirDesignatedBodyResolveTransformer( } override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { - if (designation.target.resolvePhase >= FirResolvePhase.BODY_RESOLVE) return - designation.target.checkPhase(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) - phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.BODY_RESOLVE) { designation.firFile.transform(this, ResolutionMode.ContextIndependent) } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedContractsResolveTransformer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedContractsResolveTransformer.kt index 2379c8ec6a2..772c3358e15 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedContractsResolveTransformer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedContractsResolveTransformer.kt @@ -44,9 +44,6 @@ internal class LLFirDesignatedContractsResolveTransformer( } override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { - if (designation.target.resolvePhase >= FirResolvePhase.CONTRACTS) return - designation.target.checkPhase(FirResolvePhase.ARGUMENTS_OF_ANNOTATIONS) - FirLazyBodiesCalculator.calculateLazyBodiesInside(designation) phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.CONTRACTS) { designation.firFile.transform(this, ResolutionMode.ContextIndependent) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedExpectActualMatcherTransformer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedExpectActualMatcherTransformer.kt index 1e61f51c390..f39119eb3ff 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedExpectActualMatcherTransformer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedExpectActualMatcherTransformer.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.mpp.FirExpectActualMatcherTransformer @@ -42,9 +41,6 @@ internal class LLFirDesignatedExpectActualMatcherTransformer( } override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { - if (designation.target.resolvePhase >= FirResolvePhase.EXPECT_ACTUAL_MATCHING) return - designation.target.checkPhase(FirResolvePhase.STATUS) - FirLazyBodiesCalculator.calculateLazyBodiesInside(designation) phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.EXPECT_ACTUAL_MATCHING) { designation.firFile.transform(this, null) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedGeneratedCompanionObjectResolveTransformer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedGeneratedCompanionObjectResolveTransformer.kt index d26dc06c4a6..74d10c4f32b 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedGeneratedCompanionObjectResolveTransformer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedGeneratedCompanionObjectResolveTransformer.kt @@ -22,8 +22,6 @@ internal class LLFirDesignatedGeneratedCompanionObjectResolveTransformer( private val transformer: FirCompanionGenerationTransformer = FirCompanionGenerationTransformer(session) override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { - if (designation.target.resolvePhase >= FirResolvePhase.COMPANION_GENERATION) return - phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.COMPANION_GENERATION) { designation.target.transform(transformer, null) } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedImplicitTypesTransformer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedImplicitTypesTransformer.kt index d8f0978cb64..603ee1ccbc6 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedImplicitTypesTransformer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedImplicitTypesTransformer.kt @@ -17,7 +17,6 @@ import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.declarations.resolvePhase import org.jetbrains.kotlin.fir.resolve.ResolutionMode import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.FirImplicitAwareBodyResolveTransformer @@ -55,9 +54,6 @@ internal class LLFirDesignatedImplicitTypesTransformer( } override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { - if (designation.target.resolvePhase >= FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) return - designation.target.checkPhase(FirResolvePhase.CONTRACTS) - phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) { designation.firFile.transform(this, ResolutionMode.ContextIndependent) } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedStatusResolveTransformer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedStatusResolveTransformer.kt index 420402bbf31..ed40b6ffa44 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedStatusResolveTransformer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedStatusResolveTransformer.kt @@ -77,9 +77,6 @@ internal class LLFirDesignatedStatusResolveTransformer( override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { - if (designation.target.resolvePhase >= FirResolvePhase.STATUS) return - designation.target.checkPhase(FirResolvePhase.TYPES) - val designationIterator = designation.path.iterator() val transformer = FirDesignatedStatusResolveTransformerForIDE(designationIterator) phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.STATUS) { diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedSupertypeResolverTransformer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedSupertypeResolverTransformer.kt index c6f2d45f72f..da60732dfbc 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedSupertypeResolverTransformer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedSupertypeResolverTransformer.kt @@ -155,9 +155,6 @@ internal class LLFirDesignatedSupertypeResolverTransformer( } override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { - if (designation.target.resolvePhase >= FirResolvePhase.SUPER_TYPES) return - designation.firFile.checkPhase(FirResolvePhase.IMPORTS) - val targetDesignation = if (designation.target !is FirClassLikeDeclaration) { val resolvableTarget = designation.path.lastOrNull() ?: return val targetPath = designation.path.dropLast(1) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedTypeResolverTransformer.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedTypeResolverTransformer.kt index 64a07acde46..1dd9782bff9 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedTypeResolverTransformer.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/transformers/LLFirDesignatedTypeResolverTransformer.kt @@ -45,9 +45,6 @@ internal class LLFirDesignatedTypeResolverTransformer( } override fun transformDeclaration(phaseRunner: LLFirPhaseRunner) { - if (designation.target.resolvePhase >= FirResolvePhase.TYPES) return - designation.target.checkPhase(FirResolvePhase.SUPER_TYPES) - phaseRunner.runPhaseWithCustomResolve(FirResolvePhase.TYPES) { designation.firFile.transform(this, null) }