Fix issue #1283 (#1855)

* Fixes issue #1283 * Add test for issue #1283 * Move test for issue #1283 to CSharp test suite * Fix typo
mono · Jul 26, 2024 · b658ff3 · b658ff3
1 parent 3f923b1
commit b658ff3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/src/Generator/Passes/GetterSetterToPropertyPass.cs b/src/Generator/Passes/GetterSetterToPropertyPass.cs
@@ -40,7 +40,7 @@ private static Stream GetResourceStream(Assembly assembly)
         }
 
         public GetterSetterToPropertyPass()
-            => VisitOptions.ResetFlags(VisitFlags.ClassTemplateSpecializations);
+            => VisitOptions.ResetFlags(VisitFlags.ClassBases | VisitFlags.ClassTemplateSpecializations);
 
         public override bool VisitClassDecl(Class @class)
         {

diff --git a/tests/dotnet/CSharp/CSharp.cpp b/tests/dotnet/CSharp/CSharp.cpp
@@ -1282,6 +1282,11 @@ int HasConflictWithAbstractProperty::conflictWithProperty()
     return 0;
 }
 
+int TestOverrideOfPropertyInNamespacedClass::property()
+{
+	return 0;
+}
+
 const char* HasVirtualTakesReturnsProblematicTypes::virtualTakesAndReturnsString(const char* c)
 {
     return c;

diff --git a/tests/dotnet/CSharp/CSharp.h b/tests/dotnet/CSharp/CSharp.h
@@ -1029,6 +1029,19 @@ class DLL_API HasConflictWithAbstractProperty
     virtual int getConflictWithProperty() = 0;
 };
 
+// https://github.com/mono/CppSharp/issues/1283
+namespace NamespaceWithVirtualPropertyClass {
+    class DLL_API HasOverriddenPropertyInNamespacedClass {
+    public:
+        virtual int property() = 0;
+    };
+}
+
+class DLL_API TestOverrideOfPropertyInNamespacedClass : public NamespaceWithVirtualPropertyClass::HasOverriddenPropertyInNamespacedClass {
+public:
+    virtual int property() override;
+};
+
 template <typename T>
 class lowerCase
 {