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

Implement Abstract Members Intention: Fix EA-79052

Browse Source
This commit is contained in:
Alexey Sedunov
2016-02-16 17:05:10 +03:00
parent 27ea2dc6f9
commit e1b4f45b35
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt
+2 -1
View File
@@ -78,7 +78,8 @@ abstract class ImplementAbstractMemberIntentionBase :
): CallableMemberDescriptor? { ): CallableMemberDescriptor? {
val superClass = superMember.containingDeclaration as? ClassDescriptor ?: return null val superClass = superMember.containingDeclaration as? ClassDescriptor ?: return null
val substitutor = getTypeSubstitutor(superClass.defaultType, subClass.defaultType) ?: TypeSubstitutor.EMPTY val substitutor = getTypeSubstitutor(superClass.defaultType, subClass.defaultType) ?: TypeSubstitutor.EMPTY
val subMember = subClass.findCallableMemberBySignature(superMember.substitute(substitutor) as CallableMemberDescriptor) val signatureInSubClass = superMember.substitute(substitutor) as? CallableMemberDescriptor ?: return null
val subMember = subClass.findCallableMemberBySignature(signatureInSubClass)
if (subMember?.kind?.isReal ?: false) return subMember else return null if (subMember?.kind?.isReal ?: false) return subMember else return null
} }