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

[symbol fir] fix checkIsInheritor in LC

Browse Source 
^KT-51240 fixed
This commit is contained in:
Ilya Kirillov
2022-04-19 16:59:05 +02:00
parent 2e515f3945
commit cff576844e
1 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/firLightClassUtils.kt
+7 -24
View File
@@ -436,38 +436,21 @@ internal fun KtSymbolWithMembers.createInnerClasses(
}
internal fun KtClassOrObject.checkIsInheritor(superClassOrigin: KtClassOrObject, checkDeep: Boolean): Boolean {
val subClassOrigin = this
fun KtAnalysisSession.check(): Boolean {
val subClassSymbol = subClassOrigin.getClassOrObjectSymbol()
return analyseForLightClasses(this) {
if (!superClassOrigin.canBeAnalysed()) {
return false
}
val subClassSymbol = this@checkIsInheritor.getClassOrObjectSymbol()
val superClassSymbol = superClassOrigin.getClassOrObjectSymbol()
if (subClassSymbol == superClassSymbol) return false
if (subClassSymbol == superClassSymbol) return@analyseForLightClasses false
return if (checkDeep) {
if (checkDeep) {
subClassSymbol.isSubClassOf(superClassSymbol)
} else {
subClassSymbol.isDirectSubClassOf(superClassSymbol)
}
}
// Due to the KT-51240 we cannot be sure which PSI element is better to analyse, so we try both.
//
// We specifically catch NoCacheForModuleException as a sign that LLFirSessionProvider.getModuleCache could not
// find a cache for the passed module. This means that `module(subClassOrigin)` does not have `module(superClassOrigin)` as
// its dependency, and we should try the other way around.
//
// Note, however, that the second call might also fail, since the modules can be completely independent.
// We can only hope that, since this code is invoked from the light classes, the passed PSI classes are
// relatively close to each other syntactically, meaning that there is some dependency between the modules
// they reside in.
//
// TODO: Avoid this hack when KT-51240 is fixed
return try {
analyseForLightClasses(subClassOrigin) { check() }
} catch (e: NoCacheForModuleException) {
analyseForLightClasses(superClassOrigin) { check() }
}
}
private val KtSymbolWithTypeParameters.hasReifiedParameters: Boolean