Fixed the generated C# when a template specialization with extensions is used for a secondary base.

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

Author: ddobrev

src/Generator/Generators/CSharp/CSharpSources.cs

@@ -463,29 +463,35 @@ private void GenerateInterface(Class @class)
             WriteStartBraceIndent();
 
             foreach (var method in @class.Methods.Where(m =>
-                !ASTUtils.CheckIgnoreMethod(m) && m.Access == AccessSpecifier.Public))
+                !ASTUtils.CheckIgnoreFunction(m.OriginalFunction) &&
+                m.Access == AccessSpecifier.Public))
             {
                 PushBlock(BlockKind.Method);
                 GenerateDeclarationCommon(method);
 
                 var functionName = GetMethodIdentifier(method);
 
-                Write("{0} {1}(", method.OriginalReturnType, functionName);
+                Write($"{method.OriginalReturnType} {functionName}(");
 
                 Write(FormatMethodParameters(method.Parameters));
 
                 WriteLine(");");
 
                 PopBlock(NewLineKind.BeforeNextBlock);
             }
-            foreach (var prop in @class.Properties.Where(p => p.IsGenerated && p.Access == AccessSpecifier.Public))
+            foreach (var prop in @class.Properties.Where(p => p.IsGenerated &&
+                (p.GetMethod == null || p.GetMethod.OriginalFunction == null ||
+                 !p.GetMethod.OriginalFunction.Ignore) &&
+                (p.SetMethod == null || p.SetMethod.OriginalFunction == null ||
+                 !p.SetMethod.OriginalFunction.Ignore) &&
+                p.Access == AccessSpecifier.Public))
             {
                 PushBlock(BlockKind.Property);
                 var type = prop.Type;
                 if (prop.Parameters.Count > 0 && prop.Type.IsPointerToPrimitiveType())
                     type = ((PointerType) prop.Type).Pointee;
                 GenerateDeclarationCommon(prop);
-                Write("{0} {1} {{ ", type, GetPropertyName(prop));
+                Write($"{type} {GetPropertyName(prop)} {{ ");
                 if (prop.HasGetter)
                     Write("get; ");
                 if (prop.HasSetter)

tests/CSharp/CSharpTemplates.h

@@ -36,6 +36,7 @@ class DLL_API IndependentFields : public T1
     int getIndependent();
     const T* returnTakeDependentPointer(const T* p);
     T getDependent(const T& t);
+    const T* propertyReturnDependentPointer();
     static T staticDependent(const T& t);
     template <typename AdditionalDependentType>
     void usesAdditionalDependentType(AdditionalDependentType additionalDependentType);
@@ -91,6 +92,12 @@ T IndependentFields<T>::getDependent(const T& t)
     return t;
 }
 
+template <typename T>
+const T* IndependentFields<T>::propertyReturnDependentPointer()
+{
+    return 0;
+}
+
 template <typename T>
 T IndependentFields<T>::staticDependent(const T& t)
 {
@@ -425,7 +432,7 @@ class DLL_API HasVirtualTemplate
     HasDefaultTemplateArgument<bool, bool> explicitSpecialization;
 };
 
-class DLL_API HasSpecializationForSecondaryBase : T1, DependentValueFields<int>
+class DLL_API HasSpecializationForSecondaryBase : T1, DependentValueFields<int>, IndependentFields<int>
 {
 public:
     HasSpecializationForSecondaryBase();