Merge branch 'master' into bugfix/fix-settings-creation

Author: brunomikoski

CHANGELOG.MD

@@ -192,7 +192,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - First initial working version 
 
 ### [Unreleased]
-
+- Added automatically open of the selected collectable   when using the goto button on the CollectableProperty Drawer
+- Added type specific GetEnumerator for the Collection
 
 
 [1.3.2]: https://github.com/badawe/ScriptableObjectCollection/releases/tag/v1.3.2

Scripts/Editor/CollectableScriptableObjectPropertyDrawer.cs

@@ -76,7 +76,7 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             if (collectableItem != null)
             {
                 DrawEditFoldoutButton(ref popupRect);
-                DrawGotoButton(collection, ref popupRect);
+                DrawGotoButton(ref popupRect);
             }
 
             using (new EditorGUI.PropertyScope(position, label, property))
@@ -192,7 +192,7 @@ private void DrawSearchablePopup(Rect position, SerializedProperty property)
             }
         }
 
-        public static void DrawGotoButton(ScriptableObjectCollection enumValues, ref Rect popupRect)
+        public void DrawGotoButton(ref Rect popupRect)
         {
             Rect buttonRect = popupRect;
             buttonRect.width = 30;
@@ -201,7 +201,8 @@ public static void DrawGotoButton(ScriptableObjectCollection enumValues, ref Rec
             buttonRect.x += popupRect.width;
             if (GUI.Button(buttonRect, CollectionEditorGUI.ARROW_RIGHT_CHAR))
             {
-                Selection.activeObject = enumValues;
+                Selection.activeObject = collection;
+                CollectionUtility.SetFoldoutOpen(true, collectableItem, collection);
             }
         }
 

Scripts/Editor/Utils/TypeUtility.cs

@@ -7,28 +7,16 @@ namespace BrunoMikoski.ScriptableObjectCollections
 {
     public static class TypeUtility
     {
-        private static List<Type> cachedAvaliableTypes;
+        private static List<Type> cachedAvailableTypes;
 
-        private static List<Type> AvailableTypes
-        {
-            get
-            {
-                if (cachedAvaliableTypes != null)
-                    return cachedAvaliableTypes;
-                
-                cachedAvaliableTypes = new List<Type>();
-                Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
-                for (int i = 0; i < assemblies.Length; i++)
-                {
-                    Assembly assembly = assemblies[i];
-                    if (assembly == null)
-                        continue;
-                    
-                    cachedAvaliableTypes.AddRange(assembly.GetTypes());
-                }
+        private static List<Type> AvailableTypes => cachedAvailableTypes ?? (cachedAvailableTypes = GetTypesFromAssemblies());
 
-                return cachedAvaliableTypes;
-            }
+        private static List<Type> GetTypesFromAssemblies()
+        {
+            return AppDomain.CurrentDomain.GetAssemblies()
+                .Where(x => x != null)
+                .SelectMany(x => x.GetTypes())
+                .ToList();
         }
 
         private static Dictionary<Type, List<Type>> typeToSubclasses = new Dictionary<Type, List<Type>>();

Scripts/Runtime/ScriptableObjectCollection.cs

@@ -401,6 +401,22 @@ public static ScriptableObjectCollection<ObjectType> Values
             set => base[index] = value;
         }
 
+        public IEnumerator<ObjectType> GetEnumerator()
+        {
+            using (IEnumerator<CollectableScriptableObject> itemEnum = base.GetEnumerator())
+            {
+                while (itemEnum.MoveNext())
+                {
+                    if (itemEnum.Current.IsNull())
+                        continue;
+                    ObjectType obj = itemEnum.Current as ObjectType;
+                    if (obj == null)
+                        continue;
+                    yield return obj;
+                }
+            }
+        }
+
 #if UNITY_EDITOR
 
         public T GetOrAddNew<T>(string targetName = null) where T : ObjectType