diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt index bed09a9e100..44bff5a5645 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.resolve.dfa.DataFlowAnalyzerContext import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculator import org.jetbrains.kotlin.fir.resolve.transformers.ReturnTypeCalculatorForFullBodyResolve import org.jetbrains.kotlin.fir.resolve.transformers.withScopeCleanup -import org.jetbrains.kotlin.fir.scopes.addImportingScopes +import org.jetbrains.kotlin.fir.scopes.createImportingScopes import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -48,7 +48,8 @@ open class FirBodyResolveTransformer( context.file = file packageFqName = file.packageFqName return withScopeCleanup(context.fileImportsScope) { - context.fileImportsScope.addImportingScopes(file, session, components.scopeSession) + val importingScopes = createImportingScopes(file, session, components.scopeSession) + context.fileImportsScope += importingScopes file.replaceResolvePhase(transformerPhase) @Suppress("UNCHECKED_CAST") transformDeclarationContent(file, data) as CompositeTransformResult diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt index 6c717affb92..ac4869ffbfe 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/Scopes.kt @@ -13,10 +13,6 @@ import org.jetbrains.kotlin.fir.resolve.scopeSessionKey import org.jetbrains.kotlin.fir.scopes.impl.* import org.jetbrains.kotlin.name.FqName -fun MutableList.addImportingScopes(file: FirFile, session: FirSession, scopeSession: ScopeSession) { - this += createImportingScopes(file, session, scopeSession) -} - private object FirDefaultStarImportingScopeKey : ScopeSessionKey() private object FirDefaultSimpleImportingScopeKey : ScopeSessionKey() private object FileImportingScopeKey : ScopeSessionKey()