Support inherit parameter in TypeDef.GetCustomAttributes

Issue: #121
MSDN-WhiteKnight · Jul 2, 2023 · 1ae0854 · 1ae0854
1 parent fdec3f6
commit 1ae0854
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 2 deletions.
diff --git a/CilTools.Metadata/Internal/Utils.cs b/CilTools.Metadata/Internal/Utils.cs
@@ -562,5 +562,10 @@ public static bool IsCoreAssembly(Assembly ass)
             return StrEquals(name, "mscorlib") || StrEquals(name, "netstandard") || StrEquals(name, "System.Runtime")
                 || StrEquals(name, "System.Private.CoreLib");
         }
+
+        public static bool IsCoreType(Type t, string fullName)
+        {
+            return StrEquals(t.FullName, fullName) && IsCoreAssembly(t.Assembly);
+        }
     }
 }
diff --git a/CilTools.Metadata/TypeDef.cs b/CilTools.Metadata/TypeDef.cs
@@ -702,8 +702,32 @@ public override object[] GetCustomAttributes(bool inherit)
             //this is needed to emulate GetCustomAttributesData for .NET Framework 3.5
 
             CustomAttributeHandleCollection coll = this.type.GetCustomAttributes();
+            object[] declared = Utils.ReadCustomAttributes(coll, this, this.assembly);
+
+            if (!inherit) return declared;
+
+            //merge inherited and declared
+            List<object> ret = new List<object>(coll.Count);
+
+            for (int i = 0; i < declared.Length; i++)
+            {
+                ret.Add(declared[i]);
+            }
+
+            Type bt = this.BaseType;
+
+            if (bt != null && !Utils.IsCoreType(bt, "System.Object"))
+            {
+                object[] inherited = this.BaseType.GetCustomAttributes(inherit);
+                ret.Capacity += inherited.Length;
+
+                for (int i = 0; i < inherited.Length; i++)
+                {
+                    ret.Add(inherited[i]);
+                }
+            }
 
-            return Utils.ReadCustomAttributes(coll, this, this.assembly);
+            return ret.ToArray();
         }
 
         public override bool IsDefined(Type attributeType, bool inherit)

diff --git a/tests/CilTools.Metadata.Tests/TypeDefTests.cs b/tests/CilTools.Metadata.Tests/TypeDefTests.cs
@@ -4,15 +4,17 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using CilTools.Reflection;
 using CilTools.Syntax;
 using CilTools.Tests.Common;
 using CilTools.Tests.Common.Attributes;
 using CilTools.Tests.Common.TestData;
 using CilTools.Tests.Common.TextUtils;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace CilTools.Metadata.Tests
 {
@@ -53,6 +55,12 @@ public class TypeWithStaticCtor
         static TypeWithStaticCtor() { }
     }
 
+    [My(444)]
+    public class CustomAttrsTestType { }
+
+    [Category("Unicorns")]
+    public class AttrInheritanceTestType : CustomAttrsTestType { }
+
     [TestClass]
     public class TypeDefTests
     {
@@ -988,5 +996,31 @@ public void Test_IsEnum_Negative(Type t)
             Assert.IsFalse(t.IsEnum);            
             Assert.IsTrue(t.IsClass);
         }
+
+        [TestMethod]
+        [TypeTestData(typeof(SampleType), BytecodeProviders.Metadata)]
+        public void Test_GetCustomAttributes_Empty(Type t)
+        {
+            object[] attrs = t.GetCustomAttributes(false);
+            Assert.AreEqual(0, attrs.Length);
+            attrs = t.GetCustomAttributes(true);
+            Assert.AreEqual(0, attrs.Length);
+        }
+
+        static void VerifyCustomAtrribute(object attr, string expectedType)
+        {
+            Assert.AreEqual(expectedType, ((ICustomAttribute)attr).Constructor.DeclaringType.FullName);
+        }
+
+        [TestMethod]
+        [TypeTestData(typeof(AttrInheritanceTestType), BytecodeProviders.Metadata)]
+        public void Test_GetCustomAttributes_Inherit(Type t)
+        {
+            object[] attrs = t.GetCustomAttributes(true);
+
+            Assert.AreEqual(2, attrs.Length);
+            VerifyCustomAtrribute(attrs[0], "System.ComponentModel.CategoryAttribute");
+            VerifyCustomAtrribute(attrs[1], "CilTools.Tests.Common.MyAttribute");
+        }
     }
 }