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

[analysis api] optimize search for declarations in IDE

Browse Source
This commit is contained in:
Ilya Kirillov
2022-04-17 19:00:43 +02:00
parent 9088da7b33
commit 9a562a0293
6 changed files with 19 additions and 13 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/LLFirIdePredicateBasedProvider.kt
+1 -1
View File
@@ -158,7 +158,7 @@ internal class LLFirIdePredicateBasedProvider(
val directAnnotations = annotationsOnDeclaration(declaration)
val metaAnnotations = directAnnotations
.asSequence()
.mapNotNull { declarationProvider.getClassesByClassId(ClassId.topLevel(it)).singleOrNull() }
.mapNotNull { declarationProvider.getAllClassesByClassId(ClassId.topLevel(it)).singleOrNull() }
.flatMap { annotationsResolver.annotationsOnDeclaration(it) }
.toSet()
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirProviderHelper.kt
+3 -4
View File
@@ -35,10 +35,9 @@ internal class LLFirProviderHelper(
if (classId.isLocal) return null
return executeOrReturnDefaultValueOnPCE(null) {
cache.classifierByClassId.computeIfAbsent(classId) {
val ktClass = when (val klass = declarationProvider.getClassesByClassId(classId).firstOrNull()) {
null -> declarationProvider.getTypeAliasesByClassId(classId).firstOrNull()
else -> if (klass.getClassId() == null) null else klass
} ?: return@computeIfAbsent Optional.empty()
val ktClass = declarationProvider.getClassLikeDeclarationByClassId(classId)
?: return@computeIfAbsent Optional.empty()
if (ktClass.getClassId() == null) return@computeIfAbsent Optional.empty()
val firFile = firFileBuilder.buildRawFirFileWithCaching(ktClass.containingKtFile)
val classifier = FirElementFinder.findElementIn<FirClassLikeDeclaration>(firFile) { classifier ->
classifier.symbol.classId == classId