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

[ULC] Fix invalid positive inheritor for self checking

Browse Source 
Fixed #KT-43824
This commit is contained in:
Igor Yakovlev
2020-12-14 15:38:09 +03:00
parent 0f4173cdfa
commit 45112a3c11
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
+4 -3
View File
@@ -264,11 +264,11 @@ abstract class KtLightClassForSourceDeclaration(
override fun isValid(): Boolean = classOrObject.isValid
override fun isInheritor(baseClass: PsiClass, checkDeep: Boolean): Boolean {
if (manager.areElementsEquivalent(baseClass, this)) return false
LightClassInheritanceHelper.getService(project).isInheritor(this, baseClass, checkDeep).ifSure { return it }
val qualifiedName: String? = if (baseClass is KtLightClassForSourceDeclaration) {
val baseDescriptor = baseClass.getDescriptor()
if (baseDescriptor != null) DescriptorUtils.getFqName(baseDescriptor).asString() else null
baseClass.getDescriptor()?.let(DescriptorUtils::getFqName)?.asString()
} else {
baseClass.qualifiedName
}
@@ -276,7 +276,8 @@ abstract class KtLightClassForSourceDeclaration(
val thisDescriptor = getDescriptor()
return if (qualifiedName != null && thisDescriptor != null) {
checkSuperTypeByFQName(thisDescriptor, qualifiedName, checkDeep)
qualifiedName != DescriptorUtils.getFqName(thisDescriptor).asString() &&
checkSuperTypeByFQName(thisDescriptor, qualifiedName, checkDeep)
} else {
InheritanceImplUtil.isInheritor(this, baseClass, checkDeep)
}