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

[Analysis API] improve getClassOrObjectSymbolByClassId/getTopLevelCallableSymbols

Browse Source 
add kdocs, use better names
This commit is contained in:
Ilya Kirillov
2022-09-13 18:12:02 +02:00
parent 1b17dbff09
commit 1bdde25dc7
8 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirInheritorsProvider.kt
+1 -1
View File
@@ -28,7 +28,7 @@ internal class KtFirInheritorsProvider(
val inheritorClassIds = classSymbol.firSymbol.fir.getSealedClassInheritors(analysisSession.useSiteSession)
return with(analysisSession) {
inheritorClassIds.mapNotNull { it.getCorrespondingToplevelClassOrObjectSymbol() as? KtNamedClassOrObjectSymbol }
inheritorClassIds.mapNotNull { getClassOrObjectSymbolByClassId(it) as? KtNamedClassOrObjectSymbol }
}
}
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt
+2 -2
View File
@@ -39,7 +39,7 @@ internal class KtFirSymbolContainingDeclarationProvider(
val classId = symbol.callableIdIfNonLocal?.classId
if (classId != null) {
with(analysisSession) {
return classId.getCorrespondingToplevelClassOrObjectSymbol()
return getClassOrObjectSymbolByClassId(classId)
}
}
}
@@ -160,7 +160,7 @@ internal class KtFirSymbolContainingDeclarationProvider(
}
else -> error("We should not have a ${symbol::class} from a library")
} ?: error("outerClassId should not be null for member declaration")
val containingClass = containingClassId.getCorrespondingToplevelClassOrObjectSymbol()
val containingClass = getClassOrObjectSymbolByClassId(containingClassId)
return containingClass ?: error("Class by class id should exists")
}
}
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/references/KDocReferenceResolver.kt
+3 -3
View File
@@ -107,18 +107,18 @@ internal object KDocReferenceResolver {
context(KtAnalysisSession)
private fun MutableCollection<KtSymbol>.collectSymbolsByClassId(classId: ClassId) {
classId.getCorrespondingToplevelClassOrObjectSymbol()?.let(::add)
getClassOrObjectSymbolByClassId(classId)?.let(::add)
}
context(KtAnalysisSession)
private fun MutableCollection<KtSymbol>.collectSymbolsByFqNameInterpretationAsCallableId(callableId: CallableId) {
when (val classId = callableId.classId) {
null -> {
addAll(callableId.packageName.getContainingCallableSymbolsWithName(callableId.callableName))
addAll(getTopLevelCallableSymbols(callableId.packageName, callableId.callableName))
}
else -> {
classId.getCorrespondingToplevelClassOrObjectSymbol()
getClassOrObjectSymbolByClassId(classId)
?.getDeclaredMemberScope()
?.getCallableSymbols { it == callableId.callableName }
?.let(::addAll)
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirSymbolProvider.kt
+4 -2
View File
@@ -161,9 +161,11 @@ internal class KtFirSymbolProvider(
return firSymbolBuilder.classifierBuilder.buildNamedClassOrObjectSymbol(symbol)
}
override fun getTopLevelCallableSymbols(packageFqName: FqName, name: Name): Sequence<KtSymbol> {
override fun getTopLevelCallableSymbols(packageFqName: FqName, name: Name): Sequence<KtCallableSymbol> {
val firs = firSymbolProvider.getTopLevelCallableSymbols(packageFqName, name)
return firs.asSequence().map { firSymbol -> firSymbolBuilder.buildSymbol(firSymbol) }
return firs.asSequence().map { firSymbol ->
firSymbolBuilder.buildSymbol(firSymbol) as KtCallableSymbol
}
}
override fun getPackageSymbolIfPackageExists(packageFqName: FqName): KtPackageSymbol? {