Filter undefined property getters/setters (#1417)

* Filter undefined property getters/setters

* Add test

* Fix filtering

Author: slozier

Src/IronPython/Runtime/Types/PythonTypeInfo.cs

@@ -206,15 +206,19 @@ private class StandardResolver : MemberResolver {
                 MemberGroup res;
 
                 foreach (Type curType in binder.GetContributingTypes(type)) {
-                    res = FilterObjectMembers(FilterSpecialNames(binder.GetMember(curType, name), name, action));
+                    res = binder.GetMember(curType, name);
+                    res = FilterSpecialNames(res, name, action);
+                    res = FilterProperties(res, action);
+                    res = FilterObjectMembers(res);
                     if (res.Count > 0) {
                         return res;
                     }
                 }
 
                 if (type.IsInterface) {
                     foreach (Type t in type.GetInterfaces()) {
-                        res = FilterSpecialNames(binder.GetMember(t, name), name, action);
+                        res = binder.GetMember(t, name);
+                        res = FilterSpecialNames(res, name, action);
                         if (res.Count > 0) {
                             return res;
                         }
@@ -265,7 +269,8 @@ private class ObjectResolver : StandardResolver {
                         continue;
                     }
 
-                    res = FilterSpecialNames(binder.GetMember(curType, name), name, action);
+                    res = binder.GetMember(curType, name);
+                    res = FilterSpecialNames(res, name, action);
                     if (res.Count > 0) {
                         return res;
                     }
@@ -1869,21 +1874,68 @@ private static void EnsureOperatorTable() {
             }
         }
 
+#nullable enable
+
+        private static MemberGroup FilterProperties(MemberGroup group, MemberRequestKind action) {
+            List<MemberTracker>? mts = null;
+            for (int i = 0; i < group.Count; i++) {
+                MemberTracker mt = group[i];
+
+                if (mt.MemberType == TrackerTypes.Property && mt is ReflectedPropertyTracker rpt) {
+                    if (FilterProperty(action, rpt.Property)) {
+                        mts ??= MakeListWithPreviousMembers(group, mts, i);
+                        continue;
+                    }
+                }
+                mts?.Add(mt);
+            }
+
+            if (mts != null) {
+                if (mts.Count == 0) {
+                    return MemberGroup.EmptyGroup;
+                }
+                return new MemberGroup(mts.ToArray());
+            }
+            return group;
+
+            static bool FilterProperty(MemberRequestKind action, PropertyInfo property) {
+                if (action == MemberRequestKind.Get) {
+                    if (property.GetMethod is null && property.SetMethod is not null) {
+                        return property.SetMethod != property.SetMethod.GetBaseDefinition();
+                    }
+                } else if (action == MemberRequestKind.Set) {
+                    if (property.SetMethod is null && property.GetMethod is not null) {
+                        return property.GetMethod != property.GetMethod.GetBaseDefinition();
+                    }
+                }
+                return false;
+            }
+        }
+
         private static MemberGroup/*!*/ FilterObjectMembers(MemberGroup/*!*/ group) {
             Assert.NotNull(group);
-            List<MemberTracker> mts = new List<MemberTracker>();
+            List<MemberTracker>? mts = null;
             for (int i = 0; i < group.Count; i++) {
                 MemberTracker mt = group[i];
 
                 if (mt.DeclaringType == typeof(object) || mt.DeclaringType == typeof(ObjectOps)) {
-                   continue;
+                    mts ??= MakeListWithPreviousMembers(group, mts, i);
+                    continue;
                 }
-                mts.Add(mt);
+                mts?.Add(mt);
             }
-            if (mts.Count == 0) return MemberGroup.EmptyGroup;
-            return new MemberGroup(mts.ToArray());
+
+            if (mts != null) {
+                if (mts.Count == 0) {
+                    return MemberGroup.EmptyGroup;
+                }
+                return new MemberGroup(mts.ToArray());
+            }
+            return group;
         }
 
+#nullable restore
+
         private static MemberGroup/*!*/ FilterSpecialNames(MemberGroup/*!*/ group, string/*!*/ name, MemberRequestKind/*!*/ action) {
             Assert.NotNull(group, name, action);
 

Src/IronPythonTest/InheritTest.cs

@@ -208,6 +208,20 @@ public NewClass(int width, int height) : base(-1, -1) {
         }
     }
 
+    public class PartialPropertyOverrideClass : BaseClass {
+        public override int Height {
+            set {
+                size.height = 2 * value;
+            }
+        }
+
+        public override int Width {
+            get {
+                return size.width * 2;
+            }
+        }
+    }
+
     public class UnaryClass {
         public int value;
 

Tests/test_inheritance.py

@@ -1391,4 +1391,18 @@ def __init__(self):
             self.assertEqual(a.GetFoo(), 42)
             self.assertEqual(a.GetBar(), 23)
 
+    @skipUnlessIronPython()
+    def test_partial_property_override(self):
+        # https://github.com/IronLanguages/ironpython3/issues/1375
+        from IronPythonTest import PartialPropertyOverrideClass
+        c = PartialPropertyOverrideClass()
+
+        # only the setter is overridden on Height
+        c.Height = 4
+        self.assertEqual(c.Height, 8)
+
+        # only the getter is overridden on Width
+        c.Width = 4
+        self.assertEqual(c.Width, 8)
+
 run_test(__name__)