Fix retrieving field type in the ReferencePickerAttributeDrawer; minor refactor changes

Author: arimger

Assets/Editor Toolbox/Editor/Drawers/Toolbox/PropertySelf/ReferencePickerAttributeDrawer.cs

@@ -24,20 +24,21 @@ private void UpdateContexts(ReferencePickerAttribute attribute)
 
         private Type GetParentType(SerializedProperty property, ReferencePickerAttribute attribute)
         {
-            property.GetFieldInfo(out Type propertyType);
+            var fieldInfo = property.GetFieldInfo(out _);
+            var fieldType = property.GetProperType(fieldInfo);
             var candidateType = attribute.ParentType;
             if (candidateType != null)
             {
-                if (propertyType.IsAssignableFrom(candidateType))
+                if (fieldType.IsAssignableFrom(candidateType))
                 {
                     return candidateType;
                 }
 
                 ToolboxEditorLog.AttributeUsageWarning(attribute, property,
-                    $"Provided {nameof(attribute.ParentType)} ({candidateType}) cannot be used because it's not assignable from: '{propertyType}'");
+                    $"Provided {nameof(attribute.ParentType)} ({candidateType}) cannot be used because it's not assignable from: '{fieldType}'");
             }
 
-            return propertyType;
+            return fieldType;
         }
 
         private void CreateTypeProperty(Rect position, SerializedProperty property, Type parentType)

Assets/Editor Toolbox/Editor/Utilities/PropertyUtility.cs

@@ -10,7 +10,8 @@ namespace Toolbox.Editor
 {
     public static partial class PropertyUtility
     {
-        //TODO: temp
+        //NOTE: last non-reflection implementation was ok but support for [SerializeReference] makes it a bit slow
+        // unfortunately UnityEditor.ScriptAttributeUtility.GetFieldInfoFromProperty is internal so we have to retrive it using reflection
         private static readonly MethodInfo getGetFieldInfoFromPropertyMethod =
             ReflectionUtility.GetEditorMethod("UnityEditor.ScriptAttributeUtility", "GetFieldInfoFromProperty",
                 BindingFlags.NonPublic | BindingFlags.Static);
@@ -254,7 +255,6 @@ public static Type GetScriptTypeFromProperty(SerializedProperty property)
             return scriptInstance.GetClass();
         }
 
-
         public static FieldInfo GetFieldInfo(this SerializedProperty property)
         {
             return GetFieldInfo(property, out _);
@@ -266,16 +266,9 @@ public static FieldInfo GetFieldInfo(this SerializedProperty property, out Type
             var result = getGetFieldInfoFromPropertyMethod.Invoke(null, parameters) as FieldInfo;
             propertyType = parameters[1] as Type;
             return result;
-
-            //NOTE: ...
-            //return GetFieldInfoFromProperty(property, out propertyType);
-        }
-
-        public static FieldInfo GetFieldInfo(this SerializedProperty property, out Type propertyType, Object target)
-        {
-            return GetFieldInfoFromProperty(property, out propertyType, target.GetType());
         }
 
+        [Obsolete("This method is no longer safe, use GetFieldInfo() instead.")]
         public static FieldInfo GetFieldInfoFromProperty(SerializedProperty property, out Type type)
         {
             var classType = GetScriptTypeFromProperty(property);
@@ -288,8 +281,7 @@ public static FieldInfo GetFieldInfoFromProperty(SerializedProperty property, ou
             return GetFieldInfoFromProperty(property, out type, classType);
         }
 
-        //NOTE: ...
-        //TODO: make it internal
+        [Obsolete("This method is no longer safe, use GetFieldInfo() instead.")]
         public static FieldInfo GetFieldInfoFromProperty(SerializedProperty property, out Type type, Type host)
         {
             const BindingFlags fieldFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
@@ -397,7 +389,7 @@ public static SerializedProperty GetSize(this SerializedProperty array)
 
         public static T GetAttribute<T>(SerializedProperty property) where T : Attribute
         {
-            return GetAttribute<T>(property, GetFieldInfoFromProperty(property, out _));
+            return GetAttribute<T>(property, GetFieldInfo(property, out _));
         }
 
         public static T GetAttribute<T>(SerializedProperty property, FieldInfo fieldInfo) where T : Attribute
@@ -407,7 +399,7 @@ public static T GetAttribute<T>(SerializedProperty property, FieldInfo fieldInfo
 
         public static T[] GetAttributes<T>(SerializedProperty property) where T : Attribute
         {
-            return GetAttributes<T>(property, GetFieldInfoFromProperty(property, out _));
+            return GetAttributes<T>(property, GetFieldInfo(property, out _));
         }
 
         public static T[] GetAttributes<T>(SerializedProperty property, FieldInfo fieldInfo) where T : Attribute

Assets/Editor Toolbox/Tests/Editor/PropertyUtilitesTest.cs

@@ -36,7 +36,7 @@ public void TestGetParentPass(string propertyPath, string parentName)
         public void TestGetValuePass(string propertyPath, object value)
         {
             var property = scriptableObject.FindProperty(propertyPath);
-            var fieldInfo = property.GetFieldInfo(out _, scriptableObject.targetObject);
+            var fieldInfo = property.GetFieldInfo(out _);
             property.SetProperValue(fieldInfo, value);
             var newValue = property.GetProperValue(fieldInfo);
             Assert.AreEqual(value, newValue);

Assets/Examples/Scenes/SampleScene.unity

@@ -583,15 +583,16 @@ MonoBehaviour:
     id: 1
   var3:
     id: 2
-  vars: []
+  vars:
+  - id: 3
   references:
     version: 1
     00000000:
       type: {class: SampleBehaviour6/ClassWithInterface1, ns: , asm: Assembly-CSharp}
       data:
         go: {fileID: 977748987}
         var1:
-          id: 3
+          id: 4
     00000001:
       type: {class: SampleBehaviour6/ClassWithInterface3, ns: , asm: Assembly-CSharp}
       data:
@@ -602,6 +603,8 @@ MonoBehaviour:
         var1: 0
         mat: {fileID: 2100000, guid: 7404c70251f9d0045a4aabaa49d83963, type: 2}
     00000003:
+      type: {class: , ns: , asm: }
+    00000004:
       type: {class: SampleBehaviour6/Struct, ns: , asm: Assembly-CSharp}
       data:
         var1: 1