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

[LL FIR] Remove LLFirProviderHelper.getTopLevelClassNamesInPackage

Browse Source 
- We shouldn't bypass the symbol names cache, as the IDE declaration
  provider doesn't cache name sets.

^KT-57314
This commit is contained in:
Marco Pennekamp
2023-10-19 19:23:33 +02:00
committed by Space Team
parent efe587691b
commit 8d2bf8828c
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirProvider.kt
+5 -1
View File
@@ -101,7 +101,11 @@ internal class LLFirProvider(
override fun getFirFilesByPackage(fqName: FqName): List<FirFile> = error("Should not be called in FIR IDE") override fun getFirFilesByPackage(fqName: FqName): List<FirFile> = error("Should not be called in FIR IDE")
override fun getClassNamesInPackage(fqName: FqName): Set<Name> = providerHelper.getTopLevelClassNamesInPackage(fqName) override fun getClassNamesInPackage(fqName: FqName): Set<Name> =
providerHelper.symbolNameCache.getTopLevelClassifierNamesInPackage(fqName)
?: errorWithAttachment("Cannot compute the set of class names in the given package") {
withEntry("packageFqName", fqName.asString())
}
@NoMutableState @NoMutableState
internal inner class SymbolProvider : LLFirKotlinSymbolProvider(session) { internal inner class SymbolProvider : LLFirKotlinSymbolProvider(session) {
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirProviderHelper.kt
-5
View File
@@ -119,11 +119,6 @@ internal class LLFirProviderHelper(
return classifierByClassId.getNotNullValueForNotNullContext(classId, classLikeDeclaration) return classifierByClassId.getNotNullValueForNotNullContext(classId, classLikeDeclaration)
} }
fun getTopLevelClassNamesInPackage(packageFqName: FqName): Set<Name> {
if (!allowKotlinPackage && packageFqName.isKotlinPackage()) return emptySet()
return declarationProvider.getTopLevelKotlinClassLikeDeclarationNamesInPackage(packageFqName)
}
fun getTopLevelCallableSymbols(packageFqName: FqName, name: Name): List<FirCallableSymbol<*>> { fun getTopLevelCallableSymbols(packageFqName: FqName, name: Name): List<FirCallableSymbol<*>> {
if (!allowKotlinPackage && packageFqName.isKotlinPackage()) return emptyList() if (!allowKotlinPackage && packageFqName.isKotlinPackage()) return emptyList()
val callableId = CallableId(packageFqName, name) val callableId = CallableId(packageFqName, name)