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

More correct detection of real methods to override

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-07-29 10:56:28 +03:00
parent a4c9aa43a5
commit 422a9613f1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMethodsHandler.kt
+6 -4
View File
@@ -28,7 +28,8 @@ public class OverrideMethodsHandler : OverrideImplementMethodsHandler() {
override fun collectMethodsToGenerate(descriptor: ClassDescriptor, project: Project): Collection<OverrideMemberChooserObject> { override fun collectMethodsToGenerate(descriptor: ClassDescriptor, project: Project): Collection<OverrideMemberChooserObject> {
val result = ArrayList<OverrideMemberChooserObject>() val result = ArrayList<OverrideMemberChooserObject>()
for (member in descriptor.unsubstitutedMemberScope.getAllDescriptors()) { for (member in descriptor.unsubstitutedMemberScope.getAllDescriptors()) {
if (member is CallableMemberDescriptor && !member.isReal()) { if (member is CallableMemberDescriptor
&& (member.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE || member.kind == CallableMemberDescriptor.Kind.DELEGATION)) {
val overridden = member.overriddenDescriptors val overridden = member.overriddenDescriptors
if (overridden.any { it.modality == Modality.FINAL }) continue if (overridden.any { it.modality == Modality.FINAL }) continue
@@ -65,11 +66,12 @@ public class OverrideMethodsHandler : OverrideImplementMethodsHandler() {
return result return result
} }
private fun CallableMemberDescriptor.isReal() = kind == CallableMemberDescriptor.Kind.DECLARATION
private fun toRealSupers(immediateSuper: CallableMemberDescriptor): Collection<CallableMemberDescriptor> { private fun toRealSupers(immediateSuper: CallableMemberDescriptor): Collection<CallableMemberDescriptor> {
if (immediateSuper.kind != CallableMemberDescriptor.Kind.FAKE_OVERRIDE) {
return listOf(immediateSuper)
}
val overridden = immediateSuper.overriddenDescriptors val overridden = immediateSuper.overriddenDescriptors
if (overridden.isEmpty()) return listOf(immediateSuper) assert(overridden.isNotEmpty())
return overridden.flatMap { toRealSupers(it) }.toSet() return overridden.flatMap { toRealSupers(it) }.toSet()
} }