diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt index 8ab5f21c6e7..97041024708 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt @@ -408,12 +408,6 @@ class KotlinDeserializedJvmSymbolsProvider( } } - override fun getAllCallableNamesInPackage(fqName: FqName): Set { - return getPackageParts(fqName).flatMapTo(mutableSetOf()) { packagePart -> - packagePart.proto.functionList.map { packagePart.context.nameResolver.getName(it.name) } - } - } - override fun getClassNamesInPackage(fqName: FqName): Set = javaClassFinder.findPackage(fqName) ?.getClasses { true }.orEmpty() diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/FirSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/FirSymbolProvider.kt index 3ab0c1a44a2..dbbb7c6612d 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/FirSymbolProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/FirSymbolProvider.kt @@ -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 = emptySet() - @Deprecated("will be deleted soon") open fun getClassNamesInPackage(fqName: FqName): Set = emptySet() diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt index 59f04ef9297..e8f8a80bc2d 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt @@ -257,12 +257,6 @@ class FirBuiltinSymbolProvider(val session: FirSession, val kotlinScopeProvider: } } - override fun getAllCallableNamesInPackage(fqName: FqName): Set { - return allPackageFragments[fqName]?.flatMapTo(mutableSetOf()) { - it.getAllCallableNames() - } ?: emptySet() - } - override fun getClassNamesInPackage(fqName: FqName): Set { return allPackageFragments[fqName]?.flatMapTo(mutableSetOf()) { it.getAllClassNames() diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCompositeSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCompositeSymbolProvider.kt index bcbab9ffbcb..4626ce6a311 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCompositeSymbolProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCompositeSymbolProvider.kt @@ -37,10 +37,6 @@ class FirCompositeSymbolProvider(val providers: List) : FirSy return providers.firstNotNullResult { it.getClassLikeSymbolByFqName(classId) } } - override fun getAllCallableNamesInPackage(fqName: FqName): Set { - return providers.flatMapTo(mutableSetOf()) { it.getAllCallableNamesInPackage(fqName) } - } - override fun getClassNamesInPackage(fqName: FqName): Set { return providers.flatMapTo(mutableSetOf()) { it.getClassNamesInPackage(fqName) } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirDependenciesSymbolProviderImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirDependenciesSymbolProviderImpl.kt index 8c4c66590ba..116a3a6c2e0 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirDependenciesSymbolProviderImpl.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirDependenciesSymbolProviderImpl.kt @@ -64,10 +64,6 @@ open class FirDependenciesSymbolProviderImpl(val session: FirSession) : Abstract } } - override fun getAllCallableNamesInPackage(fqName: FqName): Set { - return dependencyProviders.flatMapTo(mutableSetOf()) { it.getAllCallableNamesInPackage(fqName) } - } - override fun getClassNamesInPackage(fqName: FqName): Set { return dependencyProviders.flatMapTo(mutableSetOf()) { it.getClassNamesInPackage(fqName) } } diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeProvider.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeProvider.kt index 7ba345470a6..26bd4c5201c 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeProvider.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/providers/FirIdeProvider.kt @@ -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 { - return hashSetOf().apply { - indexHelper.getTopLevelPropertiesInPackage(fqName).mapNotNullTo(this) { it.nameAsName } - indexHelper.getTopLevelFunctionsInPackage(fqName).mapNotNullTo(this) { it.nameAsName } - } - } } } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirPackageScope.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirPackageScope.kt index 5ef64561189..689a3bd5d77 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirPackageScope.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirPackageScope.kt @@ -28,7 +28,8 @@ internal class KtFirPackageScope( private val provider get() = firScope.session.firSymbolProvider override fun getCallableNames(): Set = withValidityAssertion { - provider.getAllCallableNamesInPackage(fqName) + // TODO: KT-41048 + emptySet() } override fun getClassLikeSymbolNames(): Set = withValidityAssertion {