Merge branch 'master' of https://github.com/brunomikoski/ScriptableObjectCollection

Author: Bruno Mikoski

Scripts/Editor/Extensions/SerializedObjectExtensions.cs

@@ -0,0 +1,19 @@
+using BrunoMikoski.ScriptableObjectCollections.Utils;
+using UnityEditor;
+
+namespace BrunoMikoski.ScriptableObjectCollections
+{
+    public static class SerializedObjectExtensions
+    {
+        public static bool TryFindProperty(this SerializedObject serializedObject, string propertyName, out SerializedProperty property, bool tryBackingFieldIfFails = true)
+        {
+            property = serializedObject.FindProperty(propertyName);
+            if (property == null && tryBackingFieldIfFails)
+            {
+                property = serializedObject.FindProperty(propertyName.AsBackingField());
+            }
+
+            return property != null;
+        }
+    }
+}

Scripts/Editor/Extensions/SerializedObjectExtensions.cs.meta

@@ -9,7 +9,6 @@
 
 namespace BrunoMikoski.ScriptableObjectCollections
 {
-    
     public static class SerializedPropertyExtensions
     {
         public static FieldInfo GetFieldInfoFromPathByType(this SerializedProperty property, Type parentType)
@@ -303,4 +302,4 @@ static T DescendHierarchy<T>(object targetObject, List<string> splitName, List<i
             return DescendHierarchy<T>(newObj, splitName, splitCounts, depth + 1);
         }
     }
-}
+}

Scripts/Editor/Extensions/SerializedPropertyExtensions.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using BrunoMikoski.ScriptableObjectCollections.Utils;
 using UnityEditor;
 using UnityEngine;
 using Object = UnityEngine.Object;
@@ -201,6 +202,9 @@ private static void RunGeneratorInternal(
 
             if (generateStaticAccess)
                 CodeGenerationUtility.GenerateStaticCollectionScript(collection);
+
+            EditorUtility.SetDirty(collection);
+            ActiveEditorTracker.sharedTracker.ForceRebuild();
         }
 
         private static bool TryGetItemTemplateType(ItemTemplate itemTemplate, out Type resultType)
@@ -264,8 +268,7 @@ private static void CopyFieldToSerializedProperty(
                 return;
 
             // Get the property to copy the value to.
-            SerializedProperty serializedProperty = serializedObject.FindProperty(field.Name);
-            if (serializedProperty == null)
+            if(!serializedObject.TryFindProperty(field.Name, out SerializedProperty serializedProperty))
                 return;
 
             object value = field.GetValue(owner);

Scripts/Editor/Generators/CollectionGenerators.cs

@@ -0,0 +1,10 @@
+namespace BrunoMikoski.ScriptableObjectCollections.Utils
+{
+    public static class StringExtensions 
+    {
+        public static string AsBackingField(this string value)
+        {
+            return $"<{value}>k__BackingField";
+        }
+    }
+}