diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolverSession.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolverSession.kt index 77b08ef6d5e..af0158f681e 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolverSession.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/FirTowerResolverSession.kt @@ -24,7 +24,6 @@ import org.jetbrains.kotlin.fir.resolve.transformers.body.resolve.firUnsafe import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.ProcessorAction import org.jetbrains.kotlin.fir.scopes.impl.FirCompositeScope -import org.jetbrains.kotlin.fir.scopes.impl.FirLocalScope import org.jetbrains.kotlin.fir.scopes.impl.FirStaticScope import org.jetbrains.kotlin.fir.scopes.unsubstitutedScope import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol @@ -58,7 +57,7 @@ class FirTowerResolverSession internal constructor( this.implicitReceiversUsableAsValues = implicitReceiversUsableAsValues } - private val localScopes: List = components.localScopes.asReversed() + private val localScopes: List = components.localScopes.asReversed() private val topLevelScopes: List = if (components.typeParametersScopes.isEmpty()) @@ -229,7 +228,7 @@ class FirTowerResolverSession internal constructor( info: CallInfo ) { processExtensionsThatHideMembers(info, explicitReceiverValue = null) - val nonEmptyLocalScopes = mutableListOf() + val nonEmptyLocalScopes = mutableListOf() processLocalScopesWithNoReceiver(info, nonEmptyLocalScopes) val emptyTopLevelScopes = mutableSetOf() @@ -282,7 +281,7 @@ class FirTowerResolverSession internal constructor( private suspend fun processLocalScopesWithNoReceiver( info: CallInfo, - nonEmptyLocalScopes: MutableList + nonEmptyLocalScopes: MutableList ) { for ((index, localScope) in localScopes.withIndex()) { val result = processLevel( @@ -296,7 +295,7 @@ class FirTowerResolverSession internal constructor( private suspend fun processImplicitReceiversWithNoExplicit( info: CallInfo, - nonEmptyLocalScopes: MutableList, + nonEmptyLocalScopes: MutableList, emptyTopLevelScopes: MutableSet ) { val implicitReceiverValuesWithEmptyScopes = mutableSetOf>() @@ -332,7 +331,7 @@ class FirTowerResolverSession internal constructor( info: CallInfo, parentGroup: TowerGroup, implicitReceiverValuesWithEmptyScopes: MutableSet>, - nonEmptyLocalScopes: List, + nonEmptyLocalScopes: List, emptyTopLevelScopes: MutableSet ) { val implicitResult = processLevel( @@ -400,7 +399,7 @@ class FirTowerResolverSession internal constructor( return } - val nonEmptyLocalScopes = mutableListOf() + val nonEmptyLocalScopes = mutableListOf() for ((index, localScope) in localScopes.withIndex()) { if (processScopeForExplicitReceiver( localScope, @@ -459,7 +458,7 @@ class FirTowerResolverSession internal constructor( explicitReceiverValue: ExpressionReceiverValue, info: CallInfo, depth: Int, - nonEmptyLocalScopes: MutableList + nonEmptyLocalScopes: MutableList ) { // NB: companions are processed via implicitReceiverValues! val parentGroup = TowerGroup.Implicit(depth)