Merge pull request #7

feature/refactoring
techno-dwarf-works · Apr 21, 2024 · 0f13442 · 0f13442
1 parent 69b9cc2
commit 0f13442
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/Runtime/Comparers/IsSubClassComparer.cs b/Runtime/Comparers/IsSubClassComparer.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+
+namespace Better.Commons.Runtime.Comparers
+{
+    public class IsSubClassComparer : BaseComparer<IsSubClassComparer, Type>, IEqualityComparer<Type>
+    {
+        public bool Equals(Type x, Type y)
+        {
+            if (ReferenceEquals(x, y)) return true;
+            if (ReferenceEquals(x, null)) return false;
+            if (ReferenceEquals(y, null)) return false;
+            var isAssignableFrom = y.IsSubclassOf(x);
+            return isAssignableFrom || x == y;
+        }
+
+        public int GetHashCode(Type obj)
+        {
+            return 0;
+        }
+    }
+}
diff --git a/Runtime/Comparers/IsSubClassComparer.cs.meta b/Runtime/Comparers/IsSubClassComparer.cs.meta
diff --git a/Runtime/Extensions/TypeExtensions.cs b/Runtime/Extensions/TypeExtensions.cs
@@ -154,7 +154,7 @@ public static IEnumerable<Type> GetAllInheritedTypes(this Type self)
 
         public static IEnumerable<Type> GetAllInheritedTypes(this Type self, params Type[] excludes)
         {
-            return self.GetAllInheritedTypes().Except(excludes);
+            return self.GetAllInheritedTypes().Except(excludes, IsSubClassComparer.Instance);
         }
 
         public static IEnumerable<Type> GetAllInheritedTypesWithoutUnityObject(this Type self)

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.tdw.better.commons",
   "displayName": "Better Commons",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "unity": "2021.3",
   "description": " ",
   "dependencies": {