add: features and small bugfixing

Author: Bruno Mikoski

CHANGELOG.MD

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 ## [1.3.2]
+### Added
+ - Automatically selection of the newly created item, for renaming
+ - Added keyword validation for names
+ - Added ability to create new items from the selection dropdown.
+
 ### Changed
  - Fixed issue when trying to play without the `CollectionRegistry` created 
 

Scripts/Editor/CollectableDropdown.cs

@@ -1,12 +1,15 @@
 using System;
 using System.Linq;
+using UnityEditor;
 using UnityEditor.IMGUI.Controls;
 using UnityEngine;
+using Object = UnityEngine.Object;
 
 namespace BrunoMikoski.ScriptableObjectCollections
 {
     public sealed class CollectableDropdown : AdvancedDropdown
     {
+        private const string CREATE_NEW_TEXT = "+ Create New";
         private ScriptableObjectCollection collection;
         private Action<CollectableScriptableObject> callback;
 
@@ -33,6 +36,8 @@ protected override AdvancedDropdownItem BuildRoot()
                     parent.AddChild(new CollectableDropdownItem(collectionItem));
                 }
             }
+
+            root.AddChild(new AdvancedDropdownItem(CREATE_NEW_TEXT));
             return root;
         }
 
@@ -53,6 +58,16 @@ private AdvancedDropdownItem GetOrCreateDropdownItemForType(AdvancedDropdownItem
         protected override void ItemSelected(AdvancedDropdownItem item)
         {
             base.ItemSelected(item);
+
+            if (item.name.Equals(CREATE_NEW_TEXT, StringComparison.OrdinalIgnoreCase))
+            {
+                CollectableScriptableObject collectable = collection.AddNew(collection.GetCollectionType());
+                callback?.Invoke(collectable);
+                Selection.objects = new Object[] {collection};
+                ScriptableObjectCollectionCustomEditor.LastAddedEnum = collectable;
+                return;
+            }
+            
             if (item is CollectableDropdownItem collectableDropdownItem)
                 callback?.Invoke(collectableDropdownItem.Collectable);
             else

Scripts/Editor/CreateCollectionWizzard.cs

@@ -152,7 +152,6 @@ private void OnGUI()
                         EditorGUILayout.Space();
 
                         collectableName = EditorGUILayout.TextField("Collectable Name", collectableName);
-
                         collectionName = EditorGUILayout.TextField("Collection Name", collectionName);
 
                         generateIndirectAccess = EditorGUILayout.Toggle("Generate Indirect Access", generateIndirectAccess);

Scripts/Editor/ScriptableObjectCollectionCustomEditor.cs

@@ -30,7 +30,7 @@ private enum Warning
         private SearchField searchField;
         private bool showSettings;
         private Warning warnings;
-
+        public static CollectableScriptableObject LastAddedEnum;
 
         private static bool isWaitingForNewTypeBeCreated
         {
@@ -282,7 +282,7 @@ public static void AfterStaticAssemblyReload()
                 out ScriptableObjectCollection collection))
             {
                 Selection.activeObject = null;
-                collection.AddNew(targetType);
+                LastAddedEnum =  collection.AddNew(targetType);
                 EditorApplication.delayCall += () =>
                 {
                     Selection.activeObject = collection;
@@ -292,7 +292,7 @@ public static void AfterStaticAssemblyReload()
 
         private void AddNewItemOfType(Type targetType)
         {
-            collection.AddNew(targetType);
+            LastAddedEnum = collection.AddNew(targetType);
             filteredItemListDirty = true;
         }
 
@@ -351,11 +351,29 @@ private void DrawItem(int index)
 
                     using (EditorGUI.ChangeCheckScope changeCheck = new EditorGUI.ChangeCheckScope())
                     {
+                        GUI.SetNextControlName(collectionItem.GUID);
+
                         string newName = EditorGUILayout.DelayedTextField(collectionItem.name, CollectionEditorGUI.ItemNameStyle,
                             GUILayout.ExpandWidth(true));
 
+                        if (LastAddedEnum == collectionItem)
+                        {
+                            EditorGUI.FocusTextInControl(collectionItem.GUID);
+                            LastAddedEnum = null;
+                        }
+                        
                         if (changeCheck.changed)
-                            AssetDatabaseUtils.RenameAsset(collectionItem, newName);
+                        {
+                            if (newName.IsReservedKeyword())
+                            {
+                                Debug.LogError($"{newName} is a reserved C# keyword, will cause issues with " +
+                                               $"code generation, reverting to previous name");
+                            }
+                            else
+                            {
+                                AssetDatabaseUtils.RenameAsset(collectionItem, newName);
+                            }
+                        }
                     }
 
                     DrawSelectItem(collectionItem);

Scripts/Runtime/Extensions/StringExtensions.cs

@@ -14,6 +14,20 @@ public static class StringExtensions
         static readonly Regex FIRST_CHAR_FOLLOWED_BY_UPPER_CASES_ONLY = new Regex("(?<=[A-Z])[A-Z0-9]+$");
         static readonly Regex LOWER_CASE_NEXT_TO_NUMBER = new Regex("(?<=[0-9])[a-z]");
         static readonly Regex UPPER_CASE_INSIDE = new Regex("(?<=[A-Z])[A-Z]+?((?=[A-Z][a-z])|(?=[0-9]))");
+        
+        private static string[] RESERVED_KEYWORDS =
+        {
+            "abstract", "as", "base", " bool", " break", "byte", "case", "catch", "char", "checked", "class", "const",
+            "continue", "decimal", "default", "delegate", "do", "double", "else", "enum", "event", "explicit", "extern",
+            "false", "finally", "fixed", "float", "for", "foreach", "goto", "if", "implicit", "in", "int", "interface",
+            "internal", "is", "lock", "long", "namespace", "new", "null", "object", "operator", "out", "override",
+            "params", "private", "protected", "public", "readonly", "ref", "return", "sbyte", "sealed", "short",
+            "sizeof", "stackalloc", "static", "string", "struct", "switch", "this", "throw", "true", "try", "typeof",
+            "uint", "ulong", "unchecked", "unsafe", "ushort", "using", "virtual", "void", "volatile", "while", "add",
+            "alias", "ascending", "async", "await", "by", "descending", "dynamic", "equals", "from", "get", "global",
+            "group", "into", "join", "let", "nameof", "notnull", "on", "orderby", "partial", "partial", "remove",
+            "select", "set", "unmanaged", "value", "var", "when", "where", "where", "with", "yield","values"
+        };
 
         public static string Sanitize(this string input)
         {
@@ -123,5 +137,17 @@ public static string FirstToUpper(this string input)
         {
             return char.ToUpper(input[0]) + input.Substring(1);
         }
+        
+        public static bool IsReservedKeyword(this string targetName)
+        {
+            for (int i = 0; i < RESERVED_KEYWORDS.Length; i++)
+            {
+                string reservedKeyword = RESERVED_KEYWORDS[i];
+                if (reservedKeyword.Equals(targetName, StringComparison.OrdinalIgnoreCase))
+                    return true;
+            }
+
+            return false;
+        }
     }
 }

Scripts/Runtime/ScriptableObjectCollection.cs

@@ -157,6 +157,10 @@ public CollectableScriptableObject AddNew(Type collectionType, string assetName
             }
 
             item.name = itemName;
+
+            if(itemName.IsReservedKeyword())
+                Debug.LogError($"{itemName} is a reserved keyword name, will cause issues with code generation, please rename it");
+
             string newFileName = Path.Combine(parentFolderPath, item.name + ".asset");
 
             this.Add(item);

package.json

@@ -1,9 +1,9 @@
 {
   "name": "com.brunomikoski.scriptableobjectcollection",
   "displayName": "Scriptable Object Collection",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "unity": "2018.4",
-  "description": "Scriptable Object Collection",
+  "description": "A library to help improve the usability of Unity3D Scriptable Objects by grouping then into a collection and exposing then by code or nice inspectors!",
   "keywords": [
     "scriptable object",
     "collection",