Use FirNamedFunctionSymbol in FirScope.processFunctionsByName
This commit is contained in:
committed by
TeamCityServer
parent
2dfba10d84
commit
5daa406cdf
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.scopes
|
||||
|
||||
import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirClassifierSymbol
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
|
||||
import org.jetbrains.kotlin.name.Name
|
||||
|
||||
@@ -37,7 +37,7 @@ class FirCompositeScope(val scopes: Iterable<FirScope>) : FirScope(), FirContain
|
||||
}
|
||||
}
|
||||
|
||||
override fun processFunctionsByName(name: Name, processor: (FirFunctionSymbol<*>) -> Unit) {
|
||||
override fun processFunctionsByName(name: Name, processor: (FirNamedFunctionSymbol) -> Unit) {
|
||||
return processComposite(FirScope::processFunctionsByName, name, processor)
|
||||
}
|
||||
|
||||
|
||||
+2
-7
@@ -6,6 +6,7 @@
|
||||
package org.jetbrains.kotlin.fir.scopes
|
||||
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol
|
||||
import org.jetbrains.kotlin.name.Name
|
||||
|
||||
@@ -21,7 +22,7 @@ fun FirScope.getContainingCallableNamesIfPresent(): Set<Name> =
|
||||
fun FirScope.getContainingClassifierNamesIfPresent(): Set<Name> =
|
||||
if (this is FirContainingNamesAwareScope) getClassifierNames() else emptySet()
|
||||
|
||||
fun <S> S.processAllFunctions(processor: (FirFunctionSymbol<*>) -> Unit) where S : FirScope, S : FirContainingNamesAwareScope {
|
||||
fun <S> S.processAllFunctions(processor: (FirNamedFunctionSymbol) -> Unit) where S : FirScope, S : FirContainingNamesAwareScope {
|
||||
for (name in getCallableNames()) {
|
||||
processFunctionsByName(name, processor)
|
||||
}
|
||||
@@ -33,12 +34,6 @@ fun <S> S.processAllProperties(processor: (FirVariableSymbol<*>) -> Unit) where
|
||||
}
|
||||
}
|
||||
|
||||
fun <S> S.collectAllFunctions(): Collection<FirFunctionSymbol<*>> where S : FirScope, S : FirContainingNamesAwareScope {
|
||||
return mutableListOf<FirFunctionSymbol<*>>().apply {
|
||||
processAllFunctions(this::add)
|
||||
}
|
||||
}
|
||||
|
||||
fun <S> S.collectAllProperties(): Collection<FirVariableSymbol<*>> where S : FirScope, S : FirContainingNamesAwareScope {
|
||||
return mutableListOf<FirVariableSymbol<*>>().apply {
|
||||
processAllProperties(this::add)
|
||||
|
||||
@@ -18,7 +18,7 @@ abstract class FirScope {
|
||||
|
||||
open fun processFunctionsByName(
|
||||
name: Name,
|
||||
processor: (FirFunctionSymbol<*>) -> Unit
|
||||
processor: (FirNamedFunctionSymbol) -> Unit
|
||||
) {
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ fun FirScope.getSingleClassifier(name: Name): FirClassifierSymbol<*>? = mutableL
|
||||
processClassifiersByName(name, this::add)
|
||||
}.singleOrNull()
|
||||
|
||||
fun FirScope.getFunctions(name: Name): List<FirFunctionSymbol<*>> = mutableListOf<FirFunctionSymbol<*>>().apply {
|
||||
fun FirScope.getFunctions(name: Name): List<FirNamedFunctionSymbol> = mutableListOf<FirNamedFunctionSymbol>().apply {
|
||||
processFunctionsByName(name, this::add)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user