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

[LL API] Use session of a callable container for designation computation

Browse Source 
Synthetic callables might be created with a call-site session in which
the containing class might be not found.
This commit is contained in:
Yan Zhulanow
2023-01-17 22:54:18 +09:00
committed by Space Team
parent 4c22afd1f3
commit d442531987
1 changed files with 19 additions and 4 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/api/FirDesignation.kt
+19 -4
View File
@@ -19,11 +19,13 @@ import org.jetbrains.kotlin.analysis.utils.errors.checkWithAttachmentBuilder
import org.jetbrains.kotlin.analysis.utils.errors.unexpectedElementError
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.fir.*
import org.jetbrains.kotlin.fir.analysis.checkers.getContainingClassSymbol
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty
import org.jetbrains.kotlin.fir.declarations.utils.isLocal
import org.jetbrains.kotlin.fir.diagnostics.ConeDestructuringDeclarationsOnTopLevel
import org.jetbrains.kotlin.fir.resolve.providers.firProvider
import org.jetbrains.kotlin.fir.resolve.toSymbol
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.psi.KtFile
@@ -113,10 +115,7 @@ private fun collectDesignationPathWithContainingClass(target: FirDeclaration, co
return null
}
val useSiteSession = when (target) {
is FirSyntheticProperty -> target.getter.moduleData.session
else -> target.moduleData.session
}
val useSiteSession = getTargetSession(target)
fun resolveChunk(classId: ClassId): FirRegularClass {
val declaration = useSiteSession.firProvider.getFirClassifierByFqName(classId)
@@ -136,6 +135,22 @@ private fun collectDesignationPathWithContainingClass(target: FirDeclaration, co
return chain.toMutableList().also { it.reverse() }
}
private fun getTargetSession(target: FirDeclaration): FirSession {
if (target is FirSyntheticProperty) {
return getTargetSession(target.getter)
}
if (target is FirCallableDeclaration) {
val containingSymbol = target.containingClassLookupTag()?.toSymbol(target.moduleData.session)
if (containingSymbol != null) {
// Synthetic declarations might have a call site session
return containingSymbol.moduleData.session
}
}
return target.moduleData.session
}
private fun findNearClass(classId: ClassId, target: FirDeclaration): FirRegularClass? {
val firFile = target.getContainingFile() ?: return null
return FirElementFinder.findClassifierWithClassId(firFile, classId) as? FirRegularClass