From 1d26ce4a4e15ed82eb5da57057d5bcd77e819368 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 11 Aug 2020 15:39:58 +0300 Subject: [PATCH] [FIR] Get rid of useless methods in FirSymbolProvider --- .../KotlinDeserializedJvmSymbolsProvider.kt | 18 ------------------ .../fir/resolve/providers/FirSymbolProvider.kt | 3 --- .../providers/impl/FirBuiltinSymbolProvider.kt | 18 ------------------ .../impl/FirCompositeSymbolProvider.kt | 8 -------- .../impl/FirDependenciesSymbolProviderImpl.kt | 8 -------- 5 files changed, 55 deletions(-) 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 a6090a69427..152197b6849 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 @@ -417,26 +417,8 @@ class KotlinDeserializedJvmSymbolsProvider( ?.getClasses { true }.orEmpty() .mapTo(sortedSetOf(), JavaClass::name) - private fun getClassDeclarations(classId: ClassId): List { - return findRegularClass(classId)?.declarations ?: emptyList() - } - - private fun findRegularClass(classId: ClassId): FirRegularClass? = getClassLikeSymbolByFqName(classId)?.fir as? FirRegularClass - override fun getAllCallableNamesInClass(classId: ClassId): Set = - getClassDeclarations(classId).mapNotNullTo(mutableSetOf()) { - when (it) { - is FirSimpleFunction -> it.name - is FirVariable<*> -> it.name - else -> null - } - } - - override fun getNestedClassesNamesInClass(classId: ClassId): Set { - return getClassDeclarations(classId).filterIsInstance().mapTo(mutableSetOf()) { it.name } - } - override fun getPackage(fqName: FqName): FqName? = null } 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 046d97ce8e9..3d2fcf150c8 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 @@ -51,9 +51,6 @@ abstract class FirSymbolProvider : FirSessionComponent { open fun getAllCallableNamesInPackage(fqName: FqName): Set = emptySet() open fun getClassNamesInPackage(fqName: FqName): Set = emptySet() - open fun getAllCallableNamesInClass(classId: ClassId): Set = emptySet() - open fun getNestedClassesNamesInClass(classId: ClassId): Set = emptySet() - abstract fun getPackage(fqName: FqName): FqName? // TODO: Replace to symbol sometime } 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 3b318ce5534..5c689543694 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 @@ -267,24 +267,6 @@ class FirBuiltinSymbolProvider(val session: FirSession, val kotlinScopeProvider: } ?: emptySet() } - override fun getAllCallableNamesInClass(classId: ClassId): Set { - return getClassDeclarations(classId).mapNotNullTo(mutableSetOf()) { - when (it) { - is FirSimpleFunction -> it.name - is FirVariable<*> -> it.name - else -> null - } - } - } - - override fun getNestedClassesNamesInClass(classId: ClassId): Set { - return getClassDeclarations(classId).filterIsInstance().mapTo(mutableSetOf()) { it.name } - } - - private fun getClassDeclarations(classId: ClassId): List { - return findRegularClass(classId)?.declarations ?: emptyList() - } - private fun findRegularClass(classId: ClassId): FirRegularClass? = getClassLikeSymbolByFqName(classId)?.fir 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 83a20a3068b..5e726859e87 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 @@ -38,12 +38,4 @@ class FirCompositeSymbolProvider(val providers: List) : FirSy override fun getClassNamesInPackage(fqName: FqName): Set { return providers.flatMapTo(mutableSetOf()) { it.getClassNamesInPackage(fqName) } } - - override fun getAllCallableNamesInClass(classId: ClassId): Set { - return providers.flatMapTo(mutableSetOf()) { it.getAllCallableNamesInClass(classId) } - } - - override fun getNestedClassesNamesInClass(classId: ClassId): Set { - return providers.flatMapTo(mutableSetOf()) { it.getNestedClassesNamesInClass(classId) } - } } 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 6eac475a3bb..7b69d5ed813 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 @@ -65,12 +65,4 @@ open class FirDependenciesSymbolProviderImpl(val session: FirSession) : Abstract override fun getClassNamesInPackage(fqName: FqName): Set { return dependencyProviders.flatMapTo(mutableSetOf()) { it.getClassNamesInPackage(fqName) } } - - override fun getAllCallableNamesInClass(classId: ClassId): Set { - return dependencyProviders.flatMapTo(mutableSetOf()) { it.getAllCallableNamesInClass(classId) } - } - - override fun getNestedClassesNamesInClass(classId: ClassId): Set { - return dependencyProviders.flatMapTo(mutableSetOf()) { it.getNestedClassesNamesInClass(classId) } - } }