Fix naming conflicts with nested types and members

Fixes #1353.

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

Author: ddobrev

src/Generator/Passes/RenamePass.cs

@@ -47,12 +47,10 @@ protected RenamePass(RenameTargets targets)
 
         public virtual bool Rename(Declaration decl, out string newName)
         {
-            var method = decl as Method;
-            if (method != null && !method.IsStatic)
+            if (decl is Method method && !method.IsStatic)
             {
                 Method rootBaseMethod;
-                var @class = method.OriginalNamespace as Class;
-                if (@class != null && @class.IsInterface)
+                if (method.OriginalNamespace is Class @class && @class.IsInterface)
                     rootBaseMethod = (Method) method.OriginalFunction;
                 else
                     rootBaseMethod = method.GetRootBaseMethod();
@@ -63,8 +61,7 @@ public virtual bool Rename(Declaration decl, out string newName)
                 }
             }
 
-            var property = decl as Property;
-            if (property != null && !property.IsStatic)
+            if (decl is Property property && !property.IsStatic)
             {
                 var rootBaseProperty = ((Class) property.Namespace).GetBasePropertyByName(property);
                 if (rootBaseProperty != null && rootBaseProperty != property)
@@ -74,6 +71,16 @@ public virtual bool Rename(Declaration decl, out string newName)
                 }
             }
 
+            if (!(decl is ClassTemplateSpecialization) &&
+                !string.IsNullOrEmpty(decl.Name) && AreThereConflicts(decl, decl.Name))
+            {
+                char initialLetter = char.IsUpper(decl.Name[0]) ?
+                    char.ToLowerInvariant(decl.Name[0]) :
+                    char.ToUpperInvariant(decl.Name[0]);
+                newName = initialLetter + decl.Name.Substring(1);
+                return true;
+            }
+
             newName = decl.Name;
             return false;
         }

tests/Common/Common.Tests.cs

@@ -567,6 +567,10 @@ public void TestProperties()
             prop.StartWithVerb = 5;
 
             Assert.That(prop.Contains('a'), Is.EqualTo(prop.Contains("a")));
+
+            Assert.That(prop.conflict, Is.EqualTo(CommonTest.TestProperties.Conflict.Value1));
+            prop.conflict = CommonTest.TestProperties.Conflict.Value2;
+            Assert.That(prop.conflict, Is.EqualTo(CommonTest.TestProperties.Conflict.Value2));
         }
         using (var prop = new HasOverridenSetter())
         {

tests/Common/Common.cpp

@@ -541,7 +541,8 @@ SomeNamespace::AbstractClass::~AbstractClass()
 }
 
 TestProperties::TestProperties() : Field(0), _refToPrimitiveInSetter(0),
-    _getterAndSetterWithTheSameName(0), _setterReturnsBoolean(0), _virtualSetterReturnsBoolean(0)
+    _getterAndSetterWithTheSameName(0), _setterReturnsBoolean(0),
+    _virtualSetterReturnsBoolean(0), _conflict(Conflict::Value1)
 {
 }
 
@@ -550,7 +551,8 @@ TestProperties::TestProperties(const TestProperties& other) : Field(other.Field)
     _refToPrimitiveInSetter(other._refToPrimitiveInSetter),
     _getterAndSetterWithTheSameName(other._getterAndSetterWithTheSameName),
     _setterReturnsBoolean(other._setterReturnsBoolean),
-    _virtualSetterReturnsBoolean(other._virtualSetterReturnsBoolean)
+    _virtualSetterReturnsBoolean(other._virtualSetterReturnsBoolean),
+    _conflict(other._conflict)
 {
 }
 
@@ -693,6 +695,16 @@ bool TestProperties::contains(const char* str)
     return true;
 }
 
+TestProperties::Conflict TestProperties::GetConflict()
+{
+    return _conflict;
+}
+
+void TestProperties::SetConflict(Conflict conflict)
+{
+    _conflict = conflict;
+}
+
 HasOverridenSetter::HasOverridenSetter()
 {
 }

tests/Common/Common.h

@@ -590,6 +590,12 @@ struct DLL_API TestProperties
         Value2
     };
 
+    enum class Conflict
+    {
+        Value1,
+        Value2
+    };
+
     TestProperties();
     TestProperties(const TestProperties& other);
     int Field;
@@ -636,12 +642,16 @@ struct DLL_API TestProperties
     bool contains(char c);
     bool contains(const char* str);
 
+    Conflict GetConflict();
+    void SetConflict(Conflict _conflict);
+
 private:
     int FieldValue;
     double _refToPrimitiveInSetter;
     int _getterAndSetterWithTheSameName;
     int _setterReturnsBoolean;
     int _virtualSetterReturnsBoolean;
+    Conflict _conflict;
 };
 
 class DLL_API HasOverridenSetter : public TestProperties