Minor refactor changes

Author: arimger

Assets/Editor Toolbox/Editor/AssemblyInfo.cs

@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Toolbox.Editor.Tests")]

Assets/Editor Toolbox/Editor/AssemblyInfo.cs.meta

@@ -19,20 +19,20 @@ internal static void InitializeModule()
         }
 
 
-        private readonly static Type decoratorDrawerBase = typeof(ToolboxDecoratorDrawer<>);
-        private readonly static Type conditionDrawerBase = typeof(ToolboxConditionDrawer<>);
-        private readonly static Type selfPropertyDrawerBase = typeof(ToolboxSelfPropertyDrawer<>);
-        private readonly static Type listPropertyDrawerBase = typeof(ToolboxListPropertyDrawer<>);
+        private static readonly Type decoratorDrawerBase = typeof(ToolboxDecoratorDrawer<>);
+        private static readonly Type conditionDrawerBase = typeof(ToolboxConditionDrawer<>);
+        private static readonly Type selfPropertyDrawerBase = typeof(ToolboxSelfPropertyDrawer<>);
+        private static readonly Type listPropertyDrawerBase = typeof(ToolboxListPropertyDrawer<>);
 
-        private readonly static Dictionary<Type, ToolboxDecoratorDrawerBase> decoratorDrawers = new Dictionary<Type, ToolboxDecoratorDrawerBase>();
-        private readonly static Dictionary<Type, ToolboxConditionDrawerBase> conditionDrawers = new Dictionary<Type, ToolboxConditionDrawerBase>();
-        private readonly static Dictionary<Type, ToolboxPropertyDrawerBase> selfPropertyDrawers = new Dictionary<Type, ToolboxPropertyDrawerBase>();
-        private readonly static Dictionary<Type, ToolboxPropertyDrawerBase> listPropertyDrawers = new Dictionary<Type, ToolboxPropertyDrawerBase>();
+        private static readonly Dictionary<Type, ToolboxDecoratorDrawerBase> decoratorDrawers = new Dictionary<Type, ToolboxDecoratorDrawerBase>();
+        private static readonly Dictionary<Type, ToolboxConditionDrawerBase> conditionDrawers = new Dictionary<Type, ToolboxConditionDrawerBase>();
+        private static readonly Dictionary<Type, ToolboxPropertyDrawerBase> selfPropertyDrawers = new Dictionary<Type, ToolboxPropertyDrawerBase>();
+        private static readonly Dictionary<Type, ToolboxPropertyDrawerBase> listPropertyDrawers = new Dictionary<Type, ToolboxPropertyDrawerBase>();
 
         /// <summary>
         /// Collection of specific drawers mapped to selected (picked) object types.
         /// </summary>
-        private readonly static Dictionary<Type, ToolboxTargetTypeDrawer> targetTypeDrawers = new Dictionary<Type, ToolboxTargetTypeDrawer>();
+        private static readonly Dictionary<Type, ToolboxTargetTypeDrawer> targetTypeDrawers = new Dictionary<Type, ToolboxTargetTypeDrawer>();
 
         /// <summary>
         /// Collection of currently cached handlers mapped to a unique property key.

Assets/Editor Toolbox/Editor/ToolboxDrawerModule.cs

@@ -7,8 +7,6 @@
 using UnityEditor;
 using Object = UnityEngine.Object;
 
-[assembly: InternalsVisibleTo("Toolbox.Editor.Tests")]
-
 namespace Toolbox.Editor
 {
     public static partial class PropertyUtility
@@ -27,7 +25,9 @@ internal static bool HasModifedProperties(this SerializedProperty property)
         internal static string GetPropertyHashKey(this SerializedProperty property)
         {
             var hash = property.serializedObject.GetHashCode();
-            return string.Format("{0}.{1}", hash, property.propertyPath);
+            return property.propertyType != SerializedPropertyType.ManagedReference
+                ? $"{hash}.{property.propertyPath}"
+                : $"{hash}.{property.propertyPath}.{property.managedReferenceFieldTypename}";
         }
 
         /// <summary>
@@ -36,7 +36,9 @@ internal static string GetPropertyHashKey(this SerializedProperty property)
         internal static string GetPropertyTypeKey(this SerializedProperty property)
         {
             var type = property.serializedObject.targetObject.GetType();
-            return string.Format("{0}.{1}", type, property.propertyPath);
+            return property.propertyType != SerializedPropertyType.ManagedReference
+                ? $"{type}.{property.propertyPath}"
+                : $"{type}.{property.propertyPath}.{property.managedReferenceFieldTypename}";
         }
 
         /// <summary>

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

@@ -584,14 +584,21 @@ MonoBehaviour:
   references:
     version: 1
     00000000:
-      type: {class: SampleBehaviour6/Struct, ns: , asm: Assembly-CSharp}
+      type: {class: SampleBehaviour6/ClassWithInterface1, ns: , asm: Assembly-CSharp}
       data:
-        var1: 1
-        var2: 1
+        go: {fileID: 977748987}
+        var1:
+          id: 2
     00000001:
       type: {class: SampleBehaviour6/ClassWithInterface2, ns: , asm: Assembly-CSharp}
       data:
         var1: 0
+        mat: {fileID: 2100000, guid: 7404c70251f9d0045a4aabaa49d83963, type: 2}
+    00000002:
+      type: {class: SampleBehaviour6/Struct, ns: , asm: Assembly-CSharp}
+      data:
+        var1: 1
+        var2: 0
 --- !u!4 &752799893
 Transform:
   m_ObjectHideFlags: 2