Update nullability in isInheritorDeep
diff --git a/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclaration.kt b/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclaration.kt
index fc7520d..b827da8 100644
--- a/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclaration.kt
+++ b/analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclaration.kt
@@ -76,7 +76,7 @@
override fun getContainingClass(): PsiClass? = parent as? PsiClass
- override fun isInheritorDeep(baseClass: PsiClass?, classToByPass: PsiClass?): Boolean =
+ override fun isInheritorDeep(baseClass: PsiClass, classToByPass: PsiClass?): Boolean =
clsDelegate.isInheritorDeep(baseClass, classToByPass)
override fun getAllMethodsAndTheirSubstitutors(): List<Pair<PsiMethod?, PsiSubstitutor?>?> =
diff --git a/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacadeBase.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacadeBase.kt
index 3ab411e..0ae4f4b 100644
--- a/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacadeBase.kt
+++ b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacadeBase.kt
@@ -121,7 +121,7 @@
override fun findInnerClassByName(@NonNls name: String, checkBases: Boolean): PsiClass? = null
- override fun isInheritorDeep(baseClass: PsiClass?, classToByPass: PsiClass?): Boolean = false
+ override fun isInheritorDeep(baseClass: PsiClass, classToByPass: PsiClass?): Boolean = false
override fun getLBrace(): PsiElement? = null
diff --git a/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScriptBase.kt b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScriptBase.kt
index b0ef74f5..a62f933 100644
--- a/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScriptBase.kt
+++ b/analysis/light-classes-base/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScriptBase.kt
@@ -107,7 +107,7 @@
return baseClass.qualifiedName == CommonClassNames.JAVA_LANG_OBJECT
}
- override fun isInheritorDeep(baseClass: PsiClass?, classToByPass: PsiClass?): Boolean = false
+ override fun isInheritorDeep(baseClass: PsiClass, classToByPass: PsiClass?): Boolean = false
override fun getSuperClass(): PsiClass? {
return JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_LANG_OBJECT, resolveScope)
diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassLike.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassLike.kt
index 11d2a54..ccc054f 100644
--- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassLike.kt
+++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForClassLike.kt
@@ -176,8 +176,8 @@
abstract override fun getParent(): PsiElement?
override fun getScope(): PsiElement? = parent
- override fun isInheritorDeep(baseClass: PsiClass?, classToByPass: PsiClass?): Boolean =
- baseClass?.let { InheritanceImplUtil.isInheritorDeep(this, it, classToByPass) } ?: false
+ override fun isInheritorDeep(baseClass: PsiClass, classToByPass: PsiClass?): Boolean =
+ InheritanceImplUtil.isInheritorDeep(this, baseClass, classToByPass)
abstract override fun copy(): SymbolLightClassForClassLike<*>
}
diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForEnumEntry.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForEnumEntry.kt
index bf119445..7692ba4 100644
--- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForEnumEntry.kt
+++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForEnumEntry.kt
@@ -154,7 +154,7 @@
override fun isDeprecated(): Boolean = false
override fun isInterface(): Boolean = false
override fun isAnnotationType(): Boolean = false
- override fun isInheritorDeep(baseClass: PsiClass?, classToByPass: PsiClass?): Boolean = false
+ override fun isInheritorDeep(baseClass: PsiClass, classToByPass: PsiClass?): Boolean = false
override val kotlinOrigin: KtEnumEntry get() = enumConstant.kotlinOrigin
override val originKind: LightClassOriginKind = LightClassOriginKind.SOURCE
override fun isValid(): Boolean = enumConstant.isValid
diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForFacade.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForFacade.kt
index 0619a86..84a99d3 100644
--- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForFacade.kt
+++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForFacade.kt
@@ -172,7 +172,7 @@
override fun getOwnInnerClasses(): List<PsiClass> = listOf()
override fun getAllInnerClasses(): Array<PsiClass> = PsiClass.EMPTY_ARRAY
override fun findInnerClassByName(@NonNls name: String, checkBases: Boolean): PsiClass? = null
- override fun isInheritorDeep(baseClass: PsiClass?, classToByPass: PsiClass?): Boolean = false
+ override fun isInheritorDeep(baseClass: PsiClass, classToByPass: PsiClass?): Boolean = false
override fun getName(): String = super<KtLightClassForFacade>.getName()
override fun getQualifiedName(): String = facadeClassFqName.asString()
override fun getNameIdentifier(): PsiIdentifier? = null
diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForScript.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForScript.kt
index 374b3c6..cf79264 100644
--- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForScript.kt
+++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/SymbolLightClassForScript.kt
@@ -170,6 +170,6 @@
override fun getScope(): PsiElement = parent
- override fun isInheritorDeep(baseClass: PsiClass?, classToByPass: PsiClass?): Boolean = false
+ override fun isInheritorDeep(baseClass: PsiClass, classToByPass: PsiClass?): Boolean = false
}
\ No newline at end of file
diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightTypeParameter.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightTypeParameter.kt
index 19c740a..3febbbc 100644
--- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightTypeParameter.kt
+++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/SymbolLightTypeParameter.kt
@@ -134,7 +134,7 @@
override fun getRBrace(): PsiElement? = null
override fun getScope(): PsiElement = parent
override fun isInheritor(baseClass: PsiClass, checkDeep: Boolean): Boolean = false
- override fun isInheritorDeep(baseClass: PsiClass?, classToByPass: PsiClass?): Boolean = false
+ override fun isInheritorDeep(baseClass: PsiClass, classToByPass: PsiClass?): Boolean = false
override fun getVisibleSignatures(): MutableCollection<HierarchicalMethodSignature> = mutableListOf()
override fun setName(name: String): PsiElement = cannotModify()
override fun getNameIdentifier(): PsiIdentifier? = null
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClass.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClass.kt
index e21d79c..13b8351 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClass.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightClass.kt
@@ -510,8 +510,8 @@
override fun getScope(): PsiElement? = parent
- override fun isInheritorDeep(baseClass: PsiClass?, classToByPass: PsiClass?): Boolean =
- baseClass?.let { InheritanceImplUtil.isInheritorDeep(this, it, classToByPass) } ?: false
+ override fun isInheritorDeep(baseClass: PsiClass, classToByPass: PsiClass?): Boolean =
+ InheritanceImplUtil.isInheritorDeep(this, baseClass, classToByPass)
override fun isDeprecated(): Boolean = _deprecated
