[FIR] Get rid of useless methods in FirSymbolProvider
This commit is contained in:
-18
@@ -417,26 +417,8 @@ class KotlinDeserializedJvmSymbolsProvider(
|
|||||||
?.getClasses { true }.orEmpty()
|
?.getClasses { true }.orEmpty()
|
||||||
.mapTo(sortedSetOf(), JavaClass::name)
|
.mapTo(sortedSetOf(), JavaClass::name)
|
||||||
|
|
||||||
private fun getClassDeclarations(classId: ClassId): List<FirDeclaration> {
|
|
||||||
return findRegularClass(classId)?.declarations ?: emptyList()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private fun findRegularClass(classId: ClassId): FirRegularClass? =
|
private fun findRegularClass(classId: ClassId): FirRegularClass? =
|
||||||
getClassLikeSymbolByFqName(classId)?.fir as? FirRegularClass
|
getClassLikeSymbolByFqName(classId)?.fir as? FirRegularClass
|
||||||
|
|
||||||
override fun getAllCallableNamesInClass(classId: ClassId): Set<Name> =
|
|
||||||
getClassDeclarations(classId).mapNotNullTo(mutableSetOf()) {
|
|
||||||
when (it) {
|
|
||||||
is FirSimpleFunction -> it.name
|
|
||||||
is FirVariable<*> -> it.name
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getNestedClassesNamesInClass(classId: ClassId): Set<Name> {
|
|
||||||
return getClassDeclarations(classId).filterIsInstance<FirRegularClass>().mapTo(mutableSetOf()) { it.name }
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getPackage(fqName: FqName): FqName? = null
|
override fun getPackage(fqName: FqName): FqName? = null
|
||||||
}
|
}
|
||||||
|
|||||||
-3
@@ -51,9 +51,6 @@ abstract class FirSymbolProvider : FirSessionComponent {
|
|||||||
open fun getAllCallableNamesInPackage(fqName: FqName): Set<Name> = emptySet()
|
open fun getAllCallableNamesInPackage(fqName: FqName): Set<Name> = emptySet()
|
||||||
open fun getClassNamesInPackage(fqName: FqName): Set<Name> = emptySet()
|
open fun getClassNamesInPackage(fqName: FqName): Set<Name> = emptySet()
|
||||||
|
|
||||||
open fun getAllCallableNamesInClass(classId: ClassId): Set<Name> = emptySet()
|
|
||||||
open fun getNestedClassesNamesInClass(classId: ClassId): Set<Name> = emptySet()
|
|
||||||
|
|
||||||
abstract fun getPackage(fqName: FqName): FqName? // TODO: Replace to symbol sometime
|
abstract fun getPackage(fqName: FqName): FqName? // TODO: Replace to symbol sometime
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-18
@@ -267,24 +267,6 @@ class FirBuiltinSymbolProvider(val session: FirSession, val kotlinScopeProvider:
|
|||||||
} ?: emptySet()
|
} ?: emptySet()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getAllCallableNamesInClass(classId: ClassId): Set<Name> {
|
|
||||||
return getClassDeclarations(classId).mapNotNullTo(mutableSetOf()) {
|
|
||||||
when (it) {
|
|
||||||
is FirSimpleFunction -> it.name
|
|
||||||
is FirVariable<*> -> it.name
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getNestedClassesNamesInClass(classId: ClassId): Set<Name> {
|
|
||||||
return getClassDeclarations(classId).filterIsInstance<FirRegularClass>().mapTo(mutableSetOf()) { it.name }
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun getClassDeclarations(classId: ClassId): List<FirDeclaration> {
|
|
||||||
return findRegularClass(classId)?.declarations ?: emptyList()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun findRegularClass(classId: ClassId): FirRegularClass? =
|
private fun findRegularClass(classId: ClassId): FirRegularClass? =
|
||||||
getClassLikeSymbolByFqName(classId)?.fir
|
getClassLikeSymbolByFqName(classId)?.fir
|
||||||
|
|
||||||
|
|||||||
-8
@@ -38,12 +38,4 @@ class FirCompositeSymbolProvider(val providers: List<FirSymbolProvider>) : FirSy
|
|||||||
override fun getClassNamesInPackage(fqName: FqName): Set<Name> {
|
override fun getClassNamesInPackage(fqName: FqName): Set<Name> {
|
||||||
return providers.flatMapTo(mutableSetOf()) { it.getClassNamesInPackage(fqName) }
|
return providers.flatMapTo(mutableSetOf()) { it.getClassNamesInPackage(fqName) }
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getAllCallableNamesInClass(classId: ClassId): Set<Name> {
|
|
||||||
return providers.flatMapTo(mutableSetOf()) { it.getAllCallableNamesInClass(classId) }
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getNestedClassesNamesInClass(classId: ClassId): Set<Name> {
|
|
||||||
return providers.flatMapTo(mutableSetOf()) { it.getNestedClassesNamesInClass(classId) }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
-8
@@ -65,12 +65,4 @@ open class FirDependenciesSymbolProviderImpl(val session: FirSession) : Abstract
|
|||||||
override fun getClassNamesInPackage(fqName: FqName): Set<Name> {
|
override fun getClassNamesInPackage(fqName: FqName): Set<Name> {
|
||||||
return dependencyProviders.flatMapTo(mutableSetOf()) { it.getClassNamesInPackage(fqName) }
|
return dependencyProviders.flatMapTo(mutableSetOf()) { it.getClassNamesInPackage(fqName) }
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getAllCallableNamesInClass(classId: ClassId): Set<Name> {
|
|
||||||
return dependencyProviders.flatMapTo(mutableSetOf()) { it.getAllCallableNamesInClass(classId) }
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getNestedClassesNamesInClass(classId: ClassId): Set<Name> {
|
|
||||||
return dependencyProviders.flatMapTo(mutableSetOf()) { it.getNestedClassesNamesInClass(classId) }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user