Fix Objective-C template parameters used by an inner typedef

Author: xoofx

src/CppAst.Tests/TestObjectiveC.cs

@@ -9,7 +9,7 @@ namespace CppAst.Tests;
 public class TestObjectiveC : InlineTestBase
 {
     [Test]
-    public void TestFoundationIncludes()
+    public void TestAppKitIncludes()
     {
         if (!OperatingSystem.IsMacOS())
         {
@@ -18,7 +18,7 @@ public void TestFoundationIncludes()
         }
 
         ParseAssert("""
-                    #import <Foundation/Foundation.h>
+                    #import <AppKit/AppKit.h>
                     """,
             compilation =>
             {
@@ -148,7 +148,6 @@ @interface MyInterface
         );
     }
 
-
     [Test]
     public void TestInterfaceWithMultipleGenericParameters()
     {
@@ -182,6 +181,40 @@ @interface BaseInterface
         );
     }
 
+
+    [Test]
+    public void TestInterfaceWithGenericsAndTypedef()
+    {
+        ParseAssert("""
+                    @interface BaseInterface
+                    @end
+
+                    // Generics require a base class
+                    @interface MyInterface<T1> : BaseInterface
+                        typedef T1 HelloWorld;
+                    @end
+                    """,
+            compilation =>
+            {
+                Assert.False(compilation.HasErrors);
+                Assert.AreEqual(2, compilation.Classes.Count);
+                var myInterface = compilation.Classes[1];
+                Assert.AreEqual(CppClassKind.ObjCInterface, myInterface.ClassKind);
+                Assert.AreEqual("MyInterface", myInterface.Name);
+                Assert.AreEqual(1, myInterface.TemplateParameters.Count);
+                Assert.IsTrue(myInterface.TemplateParameters[0] is CppTemplateParameterType templateParam1 && templateParam1.Name == "T1");
+
+                // By default, typedef declared within interfaces are global, but in that case, it is depending on a template parameter
+                // So it is not part of the global namespace
+                Assert.AreEqual(0, compilation.Typedefs.Count);
+                Assert.AreEqual(1, myInterface.Typedefs.Count);
+                var typedef = myInterface.Typedefs[0];
+                Assert.AreEqual("HelloWorld", typedef.Name);
+                Assert.IsTrue(typedef.ElementType is CppTemplateParameterType templateSpecialization && templateSpecialization.Name == "T1");
+            }, GetDefaultObjCOptions()
+        );
+    }
+
     [Test]
     public void TestBlockFunctionPointer()
     {
@@ -275,6 +308,7 @@ @interface InterfaceBase
 
                 var myInterfaceBase = compilation.Classes[0];
                 Assert.AreEqual(CppClassKind.ObjCInterface, myInterfaceBase.ClassKind);
+                Assert.AreEqual(0, myInterfaceBase.BaseTypes.Count);
                 Assert.AreEqual("InterfaceBase", myInterfaceBase.Name);
 
                 var myInterface = compilation.Classes[1];

src/CppAst/CppClass.cs

@@ -28,7 +28,7 @@ public CppClass(string name) : base(CppTypeKind.StructOrClass)
             Enums = new CppContainerList<CppEnum>(this);
             Classes = new CppContainerList<CppClass>(this);
             Typedefs = new CppContainerList<CppTypedef>(this);
-            TemplateParameters = new List<CppType>();
+            TemplateParameters = new CppContainerList<CppType>(this);
             Attributes = new List<CppAttribute>();
             TokenAttributes = new List<CppAttribute>();
             ObjCImplementedProtocols = new List<CppClass>();
@@ -175,7 +175,7 @@ public override string FullName
         public List<CppClass> ObjCCategories { get; }
 
         /// <inheritdoc />
-        public List<CppType> TemplateParameters { get; }
+        public CppContainerList<CppType> TemplateParameters { get; }
 
         public List<CppTemplateArgument> TemplateSpecializedArguments { get; } = new List<CppTemplateArgument>();
 

src/CppAst/CppFunction.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Alexandre Mutel. All rights reserved.
+// Copyright (c) Alexandre Mutel. All rights reserved.
 // Licensed under the BSD-Clause 2 license.
 // See license.txt file in the project root for full license information.
 
@@ -21,7 +21,7 @@ public CppFunction(string name)
         {
             Name = name;
             Parameters = new CppContainerList<CppParameter>(this);
-            TemplateParameters = new List<CppType>();
+            TemplateParameters = new CppContainerList<CppType>(this);
             Attributes = new List<CppAttribute>();
             TokenAttributes = new List<CppAttribute>();
         }
@@ -111,7 +111,7 @@ public int DefaultParamCount
         public bool IsFunctionTemplate => ((int)Flags & (int)CppFunctionFlags.FunctionTemplate) != 0;
 
         /// <inheritdoc />
-        public List<CppType> TemplateParameters { get; }
+        public CppContainerList<CppType> TemplateParameters { get; }
 
         /// <inheritdoc />
         public override string ToString()