Fix regressed overloaded potential setters

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>

Author: ddobrev

src/Generator/Passes/GetterSetterToPropertyPass.cs

@@ -138,7 +138,7 @@ private static Property GetProperty(Method method, string name,
             Class @class = (Class) method.Namespace;
             Property property = @class.Properties.Find(
                 p => p.Field == null &&
-                    (p.Name == name ||
+                    ((!isSetter && p.HasSetter && p.Name == name) ||
                      (isSetter && p.HasGetter &&
                       GetReadWritePropertyName(p.GetMethod, name) == name)) &&
                     ((p.HasGetter &&
@@ -189,6 +189,15 @@ private static void ProcessProperties(Class @class, IEnumerable<Property> newPro
                     continue;
                 }
 
+                Property conflict = newProperties.LastOrDefault(
+                    p => p.Name == property.Name && p != property &&
+                        p.ExplicitInterfaceImpl == property.ExplicitInterfaceImpl);
+                if (conflict != null && conflict.GetMethod != null)
+                {
+                    conflict.GetMethod.GenerationKind = GenerationKind.Generate;
+                    conflict.GetMethod = null;
+                }
+
                 RenameConflictingMethods(@class, property);
                 CombineComments(property);
             }

tests/Common/Common.Tests.cs

@@ -527,6 +527,8 @@ public void TestProperties()
 
             Assert.That(prop.StartWithVerb, Is.EqualTo(25));
             prop.StartWithVerb = 5;
+
+            Assert.That(prop.Contains('a'), Is.EqualTo(prop.Contains1("a")));
         }
         using (var prop = new HasOverridenSetter())
         {

tests/Common/Common.cpp

@@ -642,6 +642,16 @@ void TestProperties::setStartWithVerb(int value)
 {
 }
 
+bool TestProperties::contains(char c)
+{
+    return true;
+}
+
+bool TestProperties::contains(const char* str)
+{
+    return true;
+}
+
 HasOverridenSetter::HasOverridenSetter()
 {
 }

tests/Common/Common.h

@@ -619,6 +619,9 @@ struct DLL_API TestProperties
 
     int startWithVerb();
     void setStartWithVerb(int value);
+
+    bool contains(char c);
+    bool contains(const char* str);
 private:
     int FieldValue;
     double _refToPrimitiveInSetter;