Override/Implement Members: Implement Members: Fix base member detection when abstract and non-abstract members with matching signatures are inherited from an interface

#KT-11115 Fixed (cherry picked from commit a3a2e57)
2016-06-24 18:08:58 +03:00
parent dd7bd2b869
commit a33f946c14
5 changed files with 37 additions and 1 deletions
@@ -334,7 +334,9 @@ public class OverrideResolver {

        @Override
        public void conflictingInterfaceMemberNotImplemented(CallableMemberDescriptor descriptor) {
-            // don't care
+            if (descriptor.getModality() == Modality.ABSTRACT) {
+                shouldImplement.add(descriptor);
+            }
        }

        @Override