diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractImportingScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractImportingScope.kt index ab426c4c27e..e7bb00fa47d 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractImportingScope.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractImportingScope.kt @@ -86,14 +86,14 @@ abstract class FirAbstractImportingScope( processor: (FirCallableSymbol<*>) -> Unit ) - final override fun processFunctionsByName(name: Name, processor: (FirNamedFunctionSymbol) -> Unit) { + override fun processFunctionsByName(name: Name, processor: (FirNamedFunctionSymbol) -> Unit) { return processCallables( name, TowerScopeLevel.Token.Functions ) { if (it is FirNamedFunctionSymbol) processor(it) } } - final override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) { + override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) { return processCallables( name, TowerScopeLevel.Token.Properties diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDefaultStarImportingScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDefaultStarImportingScope.kt index 5e88e0159bc..3f70a0919a3 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDefaultStarImportingScope.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirDefaultStarImportingScope.kt @@ -10,6 +10,10 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.builder.buildImport import org.jetbrains.kotlin.fir.declarations.builder.buildResolvedImport import org.jetbrains.kotlin.fir.resolve.ScopeSession +import org.jetbrains.kotlin.fir.resolve.calls.tower.TowerScopeLevel +import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol +import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol +import org.jetbrains.kotlin.name.Name class FirDefaultStarImportingScope( session: FirSession, @@ -33,4 +37,18 @@ class FirDefaultStarImportingScope( } } ?: emptyList() } + + override fun processFunctionsByName(name: Name, processor: (FirNamedFunctionSymbol) -> Unit) { + processCallables( + name, + TowerScopeLevel.Token.Functions + ) { if (it is FirNamedFunctionSymbol) processor(it) } + } + + override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) { + processCallables( + name, + TowerScopeLevel.Token.Properties + ) { if (it is FirVariableSymbol<*>) processor(it) } + } }