Merge pull request #85 from AlexeyTaranov/dev

Dev

Author: AlexeyTaranov

Editor/Dropdown/SerializeReferenceAdvancedDropdown.cs

@@ -22,12 +22,12 @@ public SerializeReferenceAdvancedDropdown(AdvancedDropdownState state, IEnumerab
             onSelectedTypeIndex = onSelectedNewType;
         }
 
-        public SerializeReferenceAdvancedDropdown(AdvancedDropdownState state, IEnumerable<Type> types,
-            Action<int> onSelectedNewType) :
+        public SerializeReferenceAdvancedDropdown(AdvancedDropdownState state, IReadOnlyList<Type> types,
+            Action<Type> onSelectedNewType) :
             base(state)
         {
             this.types = types;
-            onSelectedTypeIndex = onSelectedNewType;
+            onSelectedTypeIndex = i => onSelectedNewType.Invoke(types[i]);
         }
 
         protected override AdvancedDropdownItem BuildRoot()

Editor/Dropdown/SerializeReferencePropertyDrawer.cs

@@ -90,6 +90,18 @@ public static string GetTypeName(Type type)
                 return genericName;
             }
 
+            if (type.IsNested)
+            {
+                var typeName = type.FullName;
+                var lastDot = typeName?.LastIndexOf('.');
+                if (lastDot > 0)
+                {
+                    typeName = typeName.Substring(lastDot.Value + 1);
+                }
+
+                return ObjectNames.NicifyVariableName(typeName);
+            }
+
             return ObjectNames.NicifyVariableName(type.Name);
         }
 
@@ -141,9 +153,9 @@ bool IsImplementedGenericInterfacesFromGenericProperty(Type type)
             }
         }
 
-        private void WriteNewInstanceByIndexType(int typeIndex, SerializedProperty property, bool registerUndo)
+        public static void WriteNewInstanceByType(Type newType,
+            SerializedProperty property, Rect propertyRect, bool registerUndo)
         {
-            var newType = assignableTypes[typeIndex];
             var propertyType = TypeUtils.ExtractTypeFromString(property.managedReferenceFieldTypename);
 
             if (newType?.IsGenericType == true)

Editor/Dropdown/SerializeReferencePropertyDrawer_IMGUI.cs

@@ -5,8 +5,7 @@
 
 namespace SerializeReferenceDropdown.Editor.Dropdown
 {
-    [CustomPropertyDrawer(typeof(SerializeReferenceDropdownAttribute))]
-    public partial class SerializeReferencePropertyDrawer : PropertyDrawer
+    public partial class SerializeReferencePropertyDrawer
     {
         public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
         {
@@ -62,7 +61,7 @@ private void DrawIMGUITypeDropdown(Rect rect, SerializedProperty property, GUICo
             {
                 var dropdown = new SerializeReferenceAdvancedDropdown(new AdvancedDropdownState(),
                     assignableTypes,
-                    index => WriteNewInstanceByIndexType(index, property, registerUndo: true));
+                    type => WriteNewInstanceByType(type, property, propertyRect, registerUndo: true));
                 dropdown.Show(dropdownRect);
             }
 

Editor/Dropdown/SerializeReferencePropertyDrawer_UIToolkit.cs

@@ -13,8 +13,7 @@
 
 namespace SerializeReferenceDropdown.Editor.Dropdown
 {
-    [CustomPropertyDrawer(typeof(SerializeReferenceDropdownAttribute))]
-    public partial class SerializeReferencePropertyDrawer : PropertyDrawer
+    public partial class SerializeReferencePropertyDrawer
     {
         private StyleColor defaultSelectTypeTextColor;
 
@@ -142,7 +141,7 @@ void ShowDropdown()
             {
                 var dropdown = new SerializeReferenceAdvancedDropdown(new AdvancedDropdownState(),
                     assignableTypes,
-                    index => { WriteNewInstanceByIndexType(index, property, registerUndo: true); });
+                    type => { WriteNewInstanceByType(type, property, propertyRect, registerUndo: true); });
                 var buttonMatrix = selectTypeButton.worldTransform;
                 var position = new Vector3(buttonMatrix.m03, buttonMatrix.m13, buttonMatrix.m23);
                 var buttonRect = new Rect(position, selectTypeButton.contentRect.size);
@@ -212,7 +211,6 @@ void RefreshInspector()
             void ModifyDirectType()
             {
                 var prop = property.serializedObject.FindProperty(propertyPath);
-                var targetUnityObject = property.serializedObject.targetObject;
                 if (TryGetMissingType(property, assetPath, out var missingType))
                 {
                     var typeData = new TypeData()

Editor/EditReferenceType/EditReferenceTypeWindow.cs

@@ -1,20 +1,12 @@
 using System;
 using System.IO;
 using SerializeReferenceDropdown.Editor.Utils;
+using SerializeReferenceDropdown.Editor.YAMLEdit;
 using UnityEditor;
 using UnityEngine.UIElements;
 
 namespace SerializeReferenceDropdown.Editor.EditReferenceType
 {
-    public struct TypeData
-    {
-        public string AssemblyName;
-        public string Namespace;
-        public string ClassName;
-        
-        public string BuildSRTypeStr() => $"class: {ClassName}, ns: {Namespace}, asm: {AssemblyName}";
-    }
-    
     public class EditReferenceTypeWindow : EditorWindow
     {
         private static EditReferenceTypeWindow instance;

Editor/RefTo/RefToContextMenu.cs

@@ -1,4 +1,3 @@
-#if UNITY_2023_2_OR_NEWER
 using System;
 using UnityEditor;
 using UnityEngine;
@@ -124,4 +123,3 @@ public static void PasteToProperty(SerializedProperty pasteProperty)
         }
     }
 }
-#endif

Editor/RefTo/RefToExtensions.cs

@@ -1,4 +1,3 @@
-#if UNITY_2023_2_OR_NEWER
 using System;
 using System.Reflection;
 using SerializeReferenceDropdown.Editor.Utils;
@@ -149,4 +148,3 @@ public static (Type refType, Type targetType, Type hostType, Object host, bool i
         }
     }
 }
-#endif