Restore mapping of two properties of the same name save for a prefix

Signed-off-by: Dimitar Dobrev <[email protected]>

Author: ddobrev

src/Generator/Passes/GetterSetterToPropertyPass.cs

@@ -94,7 +94,7 @@ protected virtual HashSet<Property> GenerateProperties(Class @class)
                 {
                     string name = GetPropertyNameFromSetter(method.Name);
                     QualifiedType type = method.Parameters.First(p => p.Kind == ParameterKind.Regular).QualifiedType;
-                    Property property = GetProperty(method, name, type);
+                    Property property = GetProperty(method, name, type, true);
                     property.SetMethod = method;
                     newProperties.Add(property);
                 }
@@ -103,14 +103,16 @@ protected virtual HashSet<Property> GenerateProperties(Class @class)
             return newProperties;
         }
 
-        private static Property GetProperty(Method method, string name, QualifiedType type)
+        private static Property GetProperty(Method method, string name,
+            QualifiedType type, bool isSetter = false)
         {
             Type underlyingType = GetUnderlyingType(type);
             Class @class = (Class) method.Namespace;
             Property property = @class.Properties.Find(
                 p => p.Field == null &&
                     (p.Name == name ||
-                     (p.GetMethod != null && GetReadWritePropertyName(p.GetMethod, name) == name)) &&
+                     (isSetter && p.GetMethod != null &&
+                      GetReadWritePropertyName(p.GetMethod, name) == name)) &&
                     ((p.GetMethod != null &&
                       GetUnderlyingType(p.GetMethod.OriginalReturnType).Equals(underlyingType)) ||
                      (p.SetMethod != null &&

tests/Common/Common.Tests.cs

@@ -521,6 +521,7 @@ public void TestProperties()
             Assert.That(prop.nestedEnum(55), Is.EqualTo(55));
 
             Assert.That(prop.Get32Bit, Is.EqualTo(10));
+            Assert.That(prop.IsEmpty, Is.EqualTo(prop.Empty));
         }
     }
 

tests/Common/Common.cpp

@@ -618,6 +618,16 @@ int TestProperties::get32Bit()
     return 10;
 }
 
+bool TestProperties::isEmpty()
+{
+    return empty();
+}
+
+bool TestProperties::empty()
+{
+    return false;
+}
+
 HasOverridenSetter::HasOverridenSetter()
 {
 }

tests/Common/Common.h

@@ -612,6 +612,8 @@ struct DLL_API TestProperties
     int nestedEnum(int i);
 
     int get32Bit();
+    bool isEmpty();
+    bool empty();
 private:
     int FieldValue;
     double _refToPrimitiveInSetter;