[ULC] Fix invalid positive inheritor for self checking

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
@@ -264,11 +264,11 @@ abstract class KtLightClassForSourceDeclaration(
override fun isValid(): Boolean = classOrObject.isValid override fun isValid(): Boolean = classOrObject.isValid
override fun isInheritor(baseClass: PsiClass, checkDeep: Boolean): Boolean { 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 } LightClassInheritanceHelper.getService(project).isInheritor(this, baseClass, checkDeep).ifSure { return it }
val qualifiedName: String? = if (baseClass is KtLightClassForSourceDeclaration) { val qualifiedName: String? = if (baseClass is KtLightClassForSourceDeclaration) {
val baseDescriptor = baseClass.getDescriptor() baseClass.getDescriptor()?.let(DescriptorUtils::getFqName)?.asString()
if (baseDescriptor != null) DescriptorUtils.getFqName(baseDescriptor).asString() else null
} else { } else {
baseClass.qualifiedName baseClass.qualifiedName
} }
@@ -276,7 +276,8 @@ abstract class KtLightClassForSourceDeclaration(
val thisDescriptor = getDescriptor() val thisDescriptor = getDescriptor()
return if (qualifiedName != null && thisDescriptor != null) { return if (qualifiedName != null && thisDescriptor != null) {
checkSuperTypeByFQName(thisDescriptor, qualifiedName, checkDeep) qualifiedName != DescriptorUtils.getFqName(thisDescriptor).asString() &&
checkSuperTypeByFQName(thisDescriptor, qualifiedName, checkDeep)
} else { } else {
InheritanceImplUtil.isInheritor(this, baseClass, checkDeep) InheritanceImplUtil.isInheritor(this, baseClass, checkDeep)
} }
@@ -36,6 +36,7 @@ class IdeLightClassInheritanceHelper : LightClassInheritanceHelper {
checkDeep: Boolean checkDeep: Boolean
): ImpreciseResolveResult { ): ImpreciseResolveResult {
if (baseClass.project.isInDumbMode()) return NO_MATCH if (baseClass.project.isInDumbMode()) return NO_MATCH
if (lightClass.manager.areElementsEquivalent(baseClass, lightClass)) return NO_MATCH
val classOrObject = lightClass.kotlinOrigin ?: return UNSURE val classOrObject = lightClass.kotlinOrigin ?: return UNSURE
val entries = classOrObject.superTypeListEntries val entries = classOrObject.superTypeListEntries
@@ -12,6 +12,7 @@ import com.intellij.psi.impl.PsiClassImplUtil
import com.intellij.psi.impl.light.AbstractLightClass import com.intellij.psi.impl.light.AbstractLightClass
import com.intellij.psi.impl.light.LightMethod import com.intellij.psi.impl.light.LightMethod
import com.intellij.util.IncorrectOperationException import com.intellij.util.IncorrectOperationException
import org.jetbrains.kotlin.asJava.ImpreciseResolveResult
import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.classes.KtLightClass
import org.jetbrains.kotlin.asJava.classes.LightClassInheritanceHelper import org.jetbrains.kotlin.asJava.classes.LightClassInheritanceHelper
import org.jetbrains.kotlin.asJava.elements.KtLightElement import org.jetbrains.kotlin.asJava.elements.KtLightElement
@@ -48,11 +49,17 @@ class KtFakeLightClass(override val kotlinOrigin: KtClassOrObject) :
override fun getUseScope() = kotlinOrigin.useScope override fun getUseScope() = kotlinOrigin.useScope
override fun isInheritor(baseClass: PsiClass, checkDeep: Boolean): Boolean { 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 } LightClassInheritanceHelper.getService(project).isInheritor(this, baseClass, checkDeep).ifSure { return it }
val baseKtClass = (baseClass as? KtLightClass)?.kotlinOrigin ?: return false val baseKtClass = (baseClass as? KtLightClass)?.kotlinOrigin ?: return false
val baseDescriptor = baseKtClass.resolveToDescriptorIfAny() ?: return false val baseDescriptor = baseKtClass.resolveToDescriptorIfAny() ?: return false
val thisDescriptor = kotlinOrigin.resolveToDescriptorIfAny() ?: return false val thisDescriptor = kotlinOrigin.resolveToDescriptorIfAny() ?: return false
val thisFqName = DescriptorUtils.getFqName(thisDescriptor).asString()
val baseFqName = DescriptorUtils.getFqName(baseDescriptor).asString()
if (thisFqName == baseFqName) return false
return if (checkDeep) return if (checkDeep)
DescriptorUtils.isSubclass(thisDescriptor, baseDescriptor) DescriptorUtils.isSubclass(thisDescriptor, baseDescriptor)
else else
@@ -38,12 +38,16 @@ class KotlinLightClassInheritorTest : KotlinLightCodeInsightFixtureTestCase() {
doTestInheritorByText("abstract class A<T> : List<T>", "java.lang.Object", true) doTestInheritorByText("abstract class A<T> : List<T>", "java.lang.Object", true)
} }
private fun doTestInheritorByText(text: String, superQName: String, checkDeep: Boolean) { fun testClassOnSelfDeep() {
doTestInheritorByText("class A", "A", checkDeep = true, result = false)
}
private fun doTestInheritorByText(text: String, superQName: String, checkDeep: Boolean, result: Boolean = true) {
val file = myFixture.configureByText("A.kt", text) as KtFile val file = myFixture.configureByText("A.kt", text) as KtFile
val jetClass = file.declarations.filterIsInstance<KtClass>().single() val jetClass = file.declarations.filterIsInstance<KtClass>().single()
val psiClass = KotlinAsJavaSupport.getInstance(project).getLightClass(jetClass)!! val psiClass = KotlinAsJavaSupport.getInstance(project).getLightClass(jetClass)!!
val baseClass = JavaPsiFacade.getInstance(project).findClass(superQName, GlobalSearchScope.allScope(project))!! val baseClass = JavaPsiFacade.getInstance(project).findClass(superQName, GlobalSearchScope.allScope(project))!!
Assert.assertTrue(psiClass.isInheritor(baseClass, checkDeep)) Assert.assertEquals(psiClass.isInheritor(baseClass, checkDeep), result)
} }
override fun getProjectDescriptor(): LightProjectDescriptor = KotlinLightProjectDescriptor.INSTANCE override fun getProjectDescriptor(): LightProjectDescriptor = KotlinLightProjectDescriptor.INSTANCE