[FIR] Get rid of FirSymbolProvider.getAllCallableNamesInPackage
#KT-41048
This commit is contained in:
-6
@@ -408,12 +408,6 @@ class KotlinDeserializedJvmSymbolsProvider(
|
||||
}
|
||||
}
|
||||
|
||||
override fun getAllCallableNamesInPackage(fqName: FqName): Set<Name> {
|
||||
return getPackageParts(fqName).flatMapTo(mutableSetOf()) { packagePart ->
|
||||
packagePart.proto.functionList.map { packagePart.context.nameResolver.getName(it.name) }
|
||||
}
|
||||
}
|
||||
|
||||
override fun getClassNamesInPackage(fqName: FqName): Set<Name> =
|
||||
javaClassFinder.findPackage(fqName)
|
||||
?.getClasses { true }.orEmpty()
|
||||
|
||||
-3
@@ -56,9 +56,6 @@ abstract class FirSymbolProvider : FirSessionComponent {
|
||||
|
||||
abstract fun getNestedClassifierScope(classId: ClassId): FirScope?
|
||||
|
||||
@Deprecated("will be deleted soon")
|
||||
open fun getAllCallableNamesInPackage(fqName: FqName): Set<Name> = emptySet()
|
||||
|
||||
@Deprecated("will be deleted soon")
|
||||
open fun getClassNamesInPackage(fqName: FqName): Set<Name> = emptySet()
|
||||
|
||||
|
||||
-6
@@ -257,12 +257,6 @@ class FirBuiltinSymbolProvider(val session: FirSession, val kotlinScopeProvider:
|
||||
}
|
||||
}
|
||||
|
||||
override fun getAllCallableNamesInPackage(fqName: FqName): Set<Name> {
|
||||
return allPackageFragments[fqName]?.flatMapTo(mutableSetOf()) {
|
||||
it.getAllCallableNames()
|
||||
} ?: emptySet()
|
||||
}
|
||||
|
||||
override fun getClassNamesInPackage(fqName: FqName): Set<Name> {
|
||||
return allPackageFragments[fqName]?.flatMapTo(mutableSetOf()) {
|
||||
it.getAllClassNames()
|
||||
|
||||
-4
@@ -37,10 +37,6 @@ class FirCompositeSymbolProvider(val providers: List<FirSymbolProvider>) : FirSy
|
||||
return providers.firstNotNullResult { it.getClassLikeSymbolByFqName(classId) }
|
||||
}
|
||||
|
||||
override fun getAllCallableNamesInPackage(fqName: FqName): Set<Name> {
|
||||
return providers.flatMapTo(mutableSetOf()) { it.getAllCallableNamesInPackage(fqName) }
|
||||
}
|
||||
|
||||
override fun getClassNamesInPackage(fqName: FqName): Set<Name> {
|
||||
return providers.flatMapTo(mutableSetOf()) { it.getClassNamesInPackage(fqName) }
|
||||
}
|
||||
|
||||
-4
@@ -64,10 +64,6 @@ open class FirDependenciesSymbolProviderImpl(val session: FirSession) : Abstract
|
||||
}
|
||||
}
|
||||
|
||||
override fun getAllCallableNamesInPackage(fqName: FqName): Set<Name> {
|
||||
return dependencyProviders.flatMapTo(mutableSetOf()) { it.getAllCallableNamesInPackage(fqName) }
|
||||
}
|
||||
|
||||
override fun getClassNamesInPackage(fqName: FqName): Set<Name> {
|
||||
return dependencyProviders.flatMapTo(mutableSetOf()) { it.getClassNamesInPackage(fqName) }
|
||||
}
|
||||
|
||||
-9
@@ -130,15 +130,6 @@ internal class FirIdeProvider(
|
||||
override fun getClassLikeSymbolByFqName(classId: ClassId): FirClassLikeSymbol<*>? {
|
||||
return getFirClassifierByFqName(classId)?.symbol
|
||||
}
|
||||
|
||||
// TODO this should be reworked because [FirIdeProvider] should not have such method
|
||||
// used only in completion
|
||||
override fun getAllCallableNamesInPackage(fqName: FqName): Set<Name> {
|
||||
return hashSetOf<Name>().apply {
|
||||
indexHelper.getTopLevelPropertiesInPackage(fqName).mapNotNullTo(this) { it.nameAsName }
|
||||
indexHelper.getTopLevelFunctionsInPackage(fqName).mapNotNullTo(this) { it.nameAsName }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -28,7 +28,8 @@ internal class KtFirPackageScope(
|
||||
private val provider get() = firScope.session.firSymbolProvider
|
||||
|
||||
override fun getCallableNames(): Set<Name> = withValidityAssertion {
|
||||
provider.getAllCallableNamesInPackage(fqName)
|
||||
// TODO: KT-41048
|
||||
emptySet()
|
||||
}
|
||||
|
||||
override fun getClassLikeSymbolNames(): Set<Name> = withValidityAssertion {
|
||||
|
||||
Reference in New Issue
Block a user