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

Fix ClassCastException during search of overriders

Browse Source 
#EA-115095 Fixed
This commit is contained in:
Andrey Uskov
2019-05-20 15:40:20 +03:00
parent 08d1220728
commit ec1d313ecb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/overridersSearch.kt
+3 -2
View File
@@ -135,8 +135,9 @@ private fun forEachKotlinOverride(
getTypeSubstitutor(baseClassDescriptor.defaultType, inheritorDescriptor.defaultType) ?: return@runReadAction true getTypeSubstitutor(baseClassDescriptor.defaultType, inheritorDescriptor.defaultType) ?: return@runReadAction true
baseDescriptors.forEach { baseDescriptors.forEach {
val superMember = it.source.getPsi()!! val superMember = it.source.getPsi()!!
val overridingDescriptor = val overridingDescriptor = (it.substitute(substitutor) as? CallableMemberDescriptor)?.let { memberDescriptor ->
inheritorDescriptor.findCallableMemberBySignature(it.substitute(substitutor) as CallableMemberDescriptor) inheritorDescriptor.findCallableMemberBySignature(memberDescriptor)
}
val overridingMember = overridingDescriptor?.source?.getPsi() val overridingMember = overridingDescriptor?.source?.getPsi()
if (overridingMember != null) { if (overridingMember != null) {
if (!processor(superMember, overridingMember)) return@runReadAction false if (!processor(superMember, overridingMember)) return@runReadAction false