Merge pull request #65

dev
techno-dwarf-works · Mar 3, 2024 · f68ed0c · f68ed0c
2 parents 8a57b98 + cc3e29e
commit f68ed0c
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/Assets/BetterExtensions/Runtime/Extensions/TypeExtensions.cs b/Assets/BetterExtensions/Runtime/Extensions/TypeExtensions.cs
@@ -41,7 +41,41 @@ public static bool IsEnumerable(this Type self)
  }
 
  var enumerableType = typeof(IEnumerable<>);
- return self.IsSubclassOfRawGeneric(enumerableType);
+ return enumerableType.IsAssignableFromRawGeneric(self);
+ }
+
+ public static bool IsAssignableFromRawGeneric(this Type self, Type type)
+ {
+ if (self == null)
+ {
+ DebugUtility.LogException<ArgumentNullException>(nameof(self));
+ return false;
+ }
+
+ if (type == null)
+ {
+ DebugUtility.LogException<ArgumentNullException>(nameof(type));
+ return false;
+ }
+
+ var bufferType = type;
+ while (bufferType.BaseType != null)
+ {
+ if (bufferType.IsGeneric(self))
+ {
+ return true;
+ }
+
+ foreach (var subType in bufferType.GetInterfaces())
+ {
+ if (!subType.IsGeneric(self)) continue;
+ return true;
+ }
+
+ bufferType = bufferType.BaseType;
+ }
+
+ return false;
  }
 
  public static bool IsGeneric(this Type self, Type type)

diff --git a/Assets/BetterExtensions/package.json b/Assets/BetterExtensions/package.json
@@ -1,7 +1,7 @@
 {
  "name": "com.uurha.betterextensions",
  "displayName": "Better Extensions",
- "version": "1.5.9",
+ "version": "1.5.91",
  "unity": "2021.3",
  "description": "Unity extensions, serialize extension, async extension, string extension and UI extensions",
  "dependencies": {