Implemented to also cover generic classes

Author: gif-hara

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/TypeSearch/IIntrinsicTypePolicy.cs

@@ -4,6 +4,6 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
 {
     public interface IIntrinsicTypePolicy
     {
-        bool IsAllowed (Type candiateType);
+        bool IsAllowed (Type candiateType, bool ignoreGenericTypeCheck);
     }
 }

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/TypeSearch/IntrinsicTypePolicy/DefaultIntrinsicTypePolicy.cs

@@ -1,4 +1,5 @@
 using System;
+using UnityEngine;
 
 namespace MackySoft.SerializeReferenceExtensions.Editor
 {
@@ -7,12 +8,12 @@ public sealed class DefaultIntrinsicTypePolicy : IIntrinsicTypePolicy
 
         public static readonly DefaultIntrinsicTypePolicy Instance = new DefaultIntrinsicTypePolicy();
 
-        public bool IsAllowed (Type candiateType)
+        public bool IsAllowed (Type candiateType, bool ignoreGenericTypeCheck)
         {
             return
                 (candiateType.IsPublic || candiateType.IsNestedPublic || candiateType.IsNestedPrivate) &&
                 !candiateType.IsAbstract &&
-                !candiateType.IsGenericType &&
+                (ignoreGenericTypeCheck || !candiateType.IsGenericType) &&
                 !candiateType.IsPrimitive &&
                 !candiateType.IsEnum &&
                 !typeof(UnityEngine.Object).IsAssignableFrom(candiateType) &&

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/TypeSearch/TypeCandiateProvider/DefaultTypeCandiateProvider.cs

@@ -21,7 +21,7 @@ public IEnumerable<Type> GetTypeCandidates (Type baseType)
         {
             return TypeCache.GetTypesDerivedFrom(baseType)
                 .Append(baseType)
-                .Where(intrinsicTypePolicy.IsAllowed);
+                .Where(x => intrinsicTypePolicy.IsAllowed(x, false));
         }
     }
 }

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/TypeSearch/TypeCandiateProvider/Unity_2023_2_OrNewer_TypeCandiateProvider.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using UnityEditor;
 
 namespace MackySoft.SerializeReferenceExtensions.Editor
 {
@@ -46,23 +47,30 @@ private IEnumerable<Type> GetTypesWithGeneric (Type baseType)
 
             result = new List<Type>();
 
-            IEnumerable<Type> types = EnumerateAllTypesSafely();
+            // 
+            var isGenericBaseType = baseType.IsGenericType;
+            var genericTypeDefinition = isGenericBaseType ? baseType.GetGenericTypeDefinition() : baseType;
+            var targetTypeArguments = isGenericBaseType ? baseType.GetGenericArguments() : Type.EmptyTypes;
+            IEnumerable<Type> types = TypeCache.GetTypesDerivedFrom(genericTypeDefinition);
             foreach (Type type in types)
             {
-                if (!intrinsicTypePolicy.IsAllowed(type))
+                // If the type is Generic, create a MakeGenericType from the Arguments of the baseType.
+                var targetType = type.IsGenericType ? type.MakeGenericType(targetTypeArguments) : type;
+
+                if (!intrinsicTypePolicy.IsAllowed(targetType, targetType != type))
                 {
                     continue;
                 }
-                if (!typeCompatibilityPolicy.IsCompatible(baseType, type))
+                if (!typeCompatibilityPolicy.IsCompatible(baseType, targetType))
                 {
                     continue;
                 }
 
-                result.Add(type);
+                result.Add(targetType);
             }
 
             // Include the base type itself if allowed
-            if (intrinsicTypePolicy.IsAllowed(baseType) && typeCompatibilityPolicy.IsCompatible(baseType, baseType))
+            if (intrinsicTypePolicy.IsAllowed(baseType, false) && typeCompatibilityPolicy.IsCompatible(baseType, baseType))
             {
                 result.Add(baseType);
             }

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Tests/Editor/DefaultIntrinsicTypePolicyTests.cs

@@ -26,7 +26,7 @@ public static IEnumerable<TestCaseData> Cases ()
         [TestCaseSource(nameof(Cases))]
         public void IsAllowed_MatchesExpected (Type type, bool expected)
         {
-            bool actual = DefaultIntrinsicTypePolicy.Instance.IsAllowed(type);
+            bool actual = DefaultIntrinsicTypePolicy.Instance.IsAllowed(type, false);
             Assert.That(actual, Is.EqualTo(expected), type.FullName);
         }
     }