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

Optimization / clarifying: getFirClassifierContainerFile

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-12-05 16:25:54 +03:00
parent 2f3618041b
commit bef344b33e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/IdeFirProvider.kt
+4 -4
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.idea.stubindex.*
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
class IdeFirProvider( class IdeFirProvider(
@@ -74,12 +74,12 @@ class IdeFirProvider(
} }
override fun getFirClassifierContainerFile(fqName: ClassId): FirFile { override fun getFirClassifierContainerFile(fqName: ClassId): FirFile {
getFirClassifierByFqName(fqName) getFirClassifierByFqName(fqName) // Necessary to ensure cacheProvider contains this classifier
return cacheProvider.getFirClassifierContainerFile(fqName) return cacheProvider.getFirClassifierContainerFile(fqName)
} }
override fun getFirClassifierContainerFileIfAny(fqName: ClassId): FirFile? { override fun getFirClassifierContainerFileIfAny(fqName: ClassId): FirFile? {
getFirClassifierByFqName(fqName) getFirClassifierByFqName(fqName) // Necessary to ensure cacheProvider contains this classifier
return cacheProvider.getFirClassifierContainerFileIfAny(fqName) return cacheProvider.getFirClassifierContainerFileIfAny(fqName)
} }
@@ -90,7 +90,7 @@ class IdeFirProvider(
override fun getFirClassifierContainerFileIfAny(symbol: FirClassLikeSymbol<*>): FirFile? { override fun getFirClassifierContainerFileIfAny(symbol: FirClassLikeSymbol<*>): FirFile? {
val psi = symbol.fir.source?.psi val psi = symbol.fir.source?.psi
if (psi is KtClassOrObject && psi.isLocal) { if (psi is KtElement) {
val ktFile = psi.containingKtFile val ktFile = psi.containingKtFile
return getOrBuildFile(ktFile) return getOrBuildFile(ktFile)
} }