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

Provide separate access to declared callable members as opposed to all callable members

Browse Source 
All callable members contain "fake overrides", declared don't
This commit is contained in:
Andrey Breslav
2012-04-27 00:05:31 +04:00
parent 5f75be6253
commit b1627e3897
5 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java
+2 -4
View File
@@ -30,10 +30,8 @@ public class OverrideMethodsHandler extends OverrideImplementMethodsHandler {
@Override
protected Set<CallableMemberDescriptor> collectMethodsToGenerate(MutableClassDescriptor descriptor) {
final Set<CallableMemberDescriptor> superMethods = OverrideResolver.collectSuperMethods(descriptor).keySet();
for (CallableMemberDescriptor member : descriptor.getCallableMembers()) {
if (member.getKind() != CallableMemberDescriptor.Kind.FAKE_OVERRIDE) {
superMethods.removeAll(member.getOverriddenDescriptors());
}
for (CallableMemberDescriptor member : descriptor.getDeclaredCallableMembers()) {
superMethods.removeAll(member.getOverriddenDescriptors());
}
Set<CallableMemberDescriptor> result = new HashSet<CallableMemberDescriptor>();
for (CallableMemberDescriptor superMethod : superMethods) {