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

[LL FIR] fix invalid designation collection in case of classpath conflict

Browse Source 
^KTIJ-22323 fixed
This commit is contained in:
Ilya Kirillov
2022-07-27 18:40:16 +02:00
parent d9c4fda521
commit 24c9b8e006
1 changed files with 9 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/FirDeclarationDesignation.kt
+9 -4
View File
@@ -9,14 +9,15 @@ import org.jetbrains.kotlin.analysis.low.level.api.fir.util.firErrorWithAttachme
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.getContainingFile
import org.jetbrains.kotlin.analysis.low.level.api.fir.util.withFirAttachment
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.containingClass
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.utils.classId
import org.jetbrains.kotlin.fir.declarations.utils.isLocal
import org.jetbrains.kotlin.fir.renderWithType
import org.jetbrains.kotlin.fir.resolve.providers.firProvider
import org.jetbrains.kotlin.fir.resolve.toFirRegularClass
import org.jetbrains.kotlin.fir.symbols.impl.LookupTagInternals
import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLookupTagWithFixedSymbol
import org.jetbrains.kotlin.utils.checkWithAttachment
import org.jetbrains.kotlin.utils.errorWithAttachment
@@ -67,8 +68,7 @@ private fun collectDesignationPath(declaration: FirDeclaration): List<FirDeclara
is FirSimpleFunction, is FirProperty, is FirField, is FirConstructor, is FirEnumEntry -> {
val klass = declaration.containingClass() ?: return emptyList()
if (klass.classId.isLocal) return null
@OptIn(LookupTagInternals::class)
klass.toFirRegularClass(declaration.moduleData.session)
klass.toFirRegularClassFromSameSession(declaration.moduleData.session)
}
else -> return null
}
@@ -86,6 +86,11 @@ private fun collectDesignationPath(declaration: FirDeclaration): List<FirDeclara
return if (!containingClass.isLocal) containingClass.collectForNonLocal().asReversed() else null
}
private fun ConeClassLikeLookupTag.toFirRegularClassFromSameSession(useSiteSession: FirSession): FirRegularClass? {
if (this is ConeClassLookupTagWithFixedSymbol) return symbol.fir as? FirRegularClass
return useSiteSession.firProvider.getFirClassifierByFqName(classId) as? FirRegularClass
}
fun FirDeclaration.collectDesignation(firFile: FirFile): FirDeclarationDesignationWithFile =
tryCollectDesignation(firFile) ?: errorWithAttachment("No designation of local declaration") {
withFirAttachment("firFile", firFile)