Do not crash if generic class has inner class

Assets/Plugins/Editor/Vexe/Drawers/API/Core/MethodDrawer.cs

@@ -1,8 +1,8 @@
 //#define DBG
 
 using System;
-using System.Reflection;
 using System.Collections;
+using System.Reflection;
 using UnityEngine;
 using Vexe.Editor.GUIs;
 using Vexe.Editor.Types;
@@ -11,9 +11,8 @@
 using Vexe.Runtime.Types;
 using UnityObject = UnityEngine.Object;
 
-namespace Vexe.Editor.Drawers
-{
-	public class MethodDrawer
+namespace Vexe.Editor.Drawers {
+    public class MethodDrawer
 	{
 		private EditorMember[] argMembers;
 		private MethodCaller<object, object> invoke;
@@ -51,7 +50,7 @@ public void Initialize(MethodInfo method, object rawTarget, UnityObject unityTar
 
             isCoroutine = method.ReturnType == typeof(IEnumerator);
 
-            var commentAttr = method.GetCustomAttribute<CommentAttribute>();
+            var commentAttr = MemberInfoExtensions.GetCustomAttribute<CommentAttribute>(method);
             if (commentAttr != null)
                 comment = commentAttr.comment;
 

Assets/Plugins/Editor/Vexe/Drawers/API/Core/RecursiveDrawer.cs

@@ -23,11 +23,11 @@ public class RecursiveDrawer : ObjectDrawer<object>
         private bool _isToStringImpl;
         private Type _polymorphicType;
         private string _nullString;
-        private Tab[] _tabs;
+        private Vexe.Editor.Windows.Tab[] _tabs;
         private Predicate<UnityObject[]> _isDropAccepted;
         private Func<UnityObject[], UnityObject> _getDraggedObject;
-        private Func<Func<Type[]>, Action<Type>, string, Tab> _newTypeTab;
-        private Func<Func<UnityObject[]>, string, Tab> _newUnityTab;
+        private Func<Func<Type[]>, Action<Type>, string, Vexe.Editor.Windows.Tab> _newTypeTab;
+        private Func<Func<UnityObject[]>, string, Vexe.Editor.Windows.Tab> _newUnityTab;
         private bool _disablePicker, _autoAlloc;
 
         protected override void Initialize()
@@ -69,7 +69,7 @@ protected override void Initialize()
             _isDropAccepted = objs => _getDraggedObject(objs) != null;
 
             _newTypeTab = (getValues, create, title) =>
-                new Tab<Type>(
+                new Vexe.Editor.Windows.Tab<Type>(
                     @getValues: getValues,
                     @getCurrent: () => { var x = memberValue; return x == null ? null : x.GetType(); },
                     @setTarget: newType => { if (newType == null) memberValue = memberType.GetDefaultValueEmptyIfString(); else create(newType); },
@@ -78,7 +78,7 @@ protected override void Initialize()
                 );
 
             _newUnityTab = (getValues, title) =>
-                new Tab<UnityObject>(
+                new Vexe.Editor.Windows.Tab<UnityObject>(
                     @getValues: getValues,
                     @getCurrent: member.As<UnityObject>,
                     @setTarget: member.Set,
@@ -89,7 +89,7 @@ protected override void Initialize()
             int idx = 0;
             if (memberType.IsInterface)
             {
-                _tabs = new Tab[4];
+                _tabs = new Vexe.Editor.Windows.Tab[4];
 
                 _tabs[idx++] = _newUnityTab(() => UnityObject.FindObjectsOfType<UnityObject>()
                                               .OfType(memberType)
@@ -102,7 +102,7 @@ protected override void Initialize()
                                     .Where(t => t.IsA<MonoBehaviour>() && !t.IsAbstract)
                                     .ToArray(), TryCreateInstanceInGO, "New Behaviour");
             }
-            else _tabs = new Tab[1];
+            else _tabs = new Vexe.Editor.Windows.Tab[1];
 
             var systemTypes = ReflectionHelper.GetAllUserTypesOf(memberType)
                                 .Where(t => !t.IsA<UnityObject>() && !t.IsAbstract)

Assets/Plugins/Editor/Vexe/Editors/Internal/CategoryDefinitionResolver.cs

@@ -7,8 +7,7 @@
 using Vexe.Runtime.Types;
 using MembersList = System.Collections.Generic.List<System.Reflection.MemberInfo>;
 
-namespace Vexe.Editor.Internal
-{
+namespace Vexe.Editor.Internal {
     /// <summary>
     /// Responsible for the resolution of a category definition (what members are categorized in that cateogry)
     /// and determining how the members are combined in that category (united or intersected)
@@ -29,10 +28,10 @@ public CategoryDefinitionResolver()
 				var output = new MembersList();
 				output.AddRange(input.Where(m =>
 				{
-					var caetgory = m.GetCustomAttribute<CategoryAttribute>();
+					var caetgory = MemberInfoExtensions.GetCustomAttribute<CategoryAttribute>(m);
 					if (caetgory != null && caetgory.name == def.FullPath)
                         return true;
-                    var show = m.GetCustomAttribute<ShowAttribute>();
+                    var show = MemberInfoExtensions.GetCustomAttribute<ShowAttribute>(m);
 					return show != null && show.Category == def.FullPath;
 				}));
 				return output;

Assets/Plugins/Editor/Vexe/Editors/Internal/ConditionalVisibility.cs

@@ -18,7 +18,7 @@ public static bool IsVisible(MemberInfo member, object target)
             {
                 //Debug.Log("Building delegate for conditionally visible member: " + member.Name);
 
-                var attr = member.GetCustomAttribute<VisibleWhenAttribute>();
+                var attr = MemberInfoExtensions.GetCustomAttribute<VisibleWhenAttribute>(member);
                 if (attr == null)
                 {
                     _isVisibleCache[member] = AlwaysVisible;

Assets/Plugins/Editor/Vexe/Visibility/VisibilityLogic.cs

@@ -8,8 +8,7 @@
 using Vexe.Runtime.Types;
 using UnityObject = UnityEngine.Object;
 
-namespace Vexe.Editor.Visibility
-{
+namespace Vexe.Editor.Visibility {
     public static class VisibilityLogic
     {
         public static readonly VisibilityAttributes Attributes;
@@ -36,7 +35,7 @@ static VisibilityLogic()
 
         public static float GetMemberDisplayOrder(MemberInfo member)
         {
-            var attribute = member.GetCustomAttribute<DisplayAttribute>();
+            var attribute = MemberInfoExtensions.GetCustomAttribute<DisplayAttribute>(member);
             if (attribute != null && attribute.DisplayOrder.HasValue)
                 return attribute.Order;
 
@@ -60,15 +59,15 @@ public static float GetMemberDisplayOrder(MemberInfo member)
         public static bool IsVisibleMember(MemberInfo member)
         {
             if (member is MethodInfo)
-                return Attributes.Show.Any(member.IsDefined);
+                return Attributes.Show.Any((t) => MemberInfoExtensions.IsDefined(member, t));
 
             var field = member as FieldInfo;
             if (field != null)
             {
-                if (Attributes.Hide.Any(field.IsDefined))
+                if (Attributes.Hide.Any((t) => MemberInfoExtensions.IsDefined(field, t)))
                     return false;
 
-                if (Attributes.Show.Any(field.IsDefined))
+                if (Attributes.Show.Any((t) => MemberInfoExtensions.IsDefined(field, t)))
                     return true;
 
                 if (field.IsDefined<SerializeField>())
@@ -78,7 +77,7 @@ public static bool IsVisibleMember(MemberInfo member)
             }
 
             var property = member as PropertyInfo;
-            if (property == null || Attributes.Hide.Any(property.IsDefined))
+            if (property == null || Attributes.Hide.Any((t) => MemberInfoExtensions.IsDefined(property, t)))
                 return false;
 
             // accept properties such as transform.position, rigidbody.mass, etc
@@ -90,7 +89,7 @@ public static bool IsVisibleMember(MemberInfo member)
             if (unityProp)
                 return true;
 
-            if (Attributes.Show.Any(property.IsDefined))
+            if (Attributes.Show.Any((t) => MemberInfoExtensions.IsDefined(property, t)))
                 return true;
 
             return false;
@@ -103,7 +102,7 @@ public static bool IsVisibleMember(MemberInfo member)
 
         public static bool IsSerializableType(Type type)
         {
-            if (type.IsPrimitive || type.IsEnum || type == typeof(string)
+            if (type.GetTypeInfo().IsPrimitive || type.GetTypeInfo().IsEnum || type == typeof(string)
                 || type.IsA<UnityObject>()
                 || IsUnityStructType(type))
                 return true;