azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Get rid of useless methods in FirSymbolProvider

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-08-11 15:39:58 +03:00
parent f0d05a321d
commit 1d26ce4a4e
5 changed files with 0 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt
-18
View File
@@ -417,26 +417,8 @@ class KotlinDeserializedJvmSymbolsProvider(
?.getClasses { true }.orEmpty()
.mapTo(sortedSetOf(), JavaClass::name)
private fun getClassDeclarations(classId: ClassId): List<FirDeclaration> {
return findRegularClass(classId)?.declarations ?: emptyList()
}
private fun findRegularClass(classId: ClassId): 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
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/FirSymbolProvider.kt
-3
View File
@@ -51,9 +51,6 @@ abstract class FirSymbolProvider : FirSessionComponent {
open fun getAllCallableNamesInPackage(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
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirBuiltinSymbolProvider.kt
-18
View File
@@ -267,24 +267,6 @@ class FirBuiltinSymbolProvider(val session: FirSession, val kotlinScopeProvider:
} ?: 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? =
getClassLikeSymbolByFqName(classId)?.fir
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirCompositeSymbolProvider.kt
-8
View File
@@ -38,12 +38,4 @@ class FirCompositeSymbolProvider(val providers: List<FirSymbolProvider>) : FirSy
override fun getClassNamesInPackage(fqName: FqName): Set<Name> {
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) }
}
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirDependenciesSymbolProviderImpl.kt
-8
View File
@@ -65,12 +65,4 @@ open class FirDependenciesSymbolProviderImpl(val session: FirSession) : Abstract
override fun getClassNamesInPackage(fqName: FqName): Set<Name> {
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) }
}
}