feat: Added integration with MissingScriptType

- added integration with the new MissingScriptType package
- refactored custom editors: changed inheritance, remade GenericHeaderEditor into GenericHeaderUtility
- moved some code to SolidUtilities so that it can be used in MissingScriptType

Author: SolidAlloy

Editor/AssemblyCreator/AssemblyCreatorHelper.cs

@@ -7,6 +7,7 @@
     using System.Reflection;
     using System.Reflection.Emit;
     using GenericUnityObjects.Util;
+    using SolidUtilities;
     using UnityEngine;
     using Util;
 
@@ -126,7 +127,7 @@ public static (string componentName, int order) GetComponentMenu(Type type)
 
             if ( ! componentName.Contains("<"))
             {
-                componentName = $"{componentName}{TypeUtility.GetNiceArgsOfGenericType(type)}";
+                componentName = $"{componentName}{TypeHelper.GetNiceArgsOfGenericType(type)}";
             }
 
             return (componentName, order);
@@ -162,7 +163,7 @@ public ConcreteClassAssembly(string dirPath, string assemblyName, string classNa
 
                 _assemblyBuilder = GetAssemblyBuilder(dirPath, assemblyName);
                 ModuleBuilder moduleBuilder = GetModuleBuilder(_assemblyBuilder, assemblyName);
-                TypeBuilder = moduleBuilder.DefineType($"GenericUnityObjects.ConcreteClasses.{className}", TypeAttributes.NotPublic, parentType);
+                TypeBuilder = moduleBuilder.DefineType($"{Config.ConcreteClassNamespace}.{className}", TypeAttributes.NotPublic, parentType);
             }
 
             public void Dispose()

Editor/Drawers/BehaviourSelectorEditor.cs

@@ -3,8 +3,8 @@
     using System.Linq;
     using GenericUnityObjects.Util;
     using MonoBehaviours;
-    using SolidUtilities.Editor;
     using SolidUtilities;
+    using SolidUtilities.Editor;
     using UnityEditor;
     using UnityEngine;
 
@@ -27,7 +27,7 @@ private void OnEnable()
             _typesArray = serializedObject.FindProperty(nameof(BehaviourSelector.TypeRefs));
             _genericTypeNameWithoutSuffix = _targetSelector.GenericBehaviourType.Name.StripGenericSuffix();
             _argumentNames = new string[_targetSelector.TypeRefs.Length];
-            _genericArgNames = TypeUtility.GetNiceArgsOfGenericType(_targetSelector.GenericBehaviourType);
+            _genericArgNames = TypeHelper.GetNiceArgsOfGenericType(_targetSelector.GenericBehaviourType);
             _drawer = new TypeReferenceWithBaseTypesDrawer();
         }
 

Editor/Drawers/GenericHeaderEditor.cs Editor/Drawers/GenericHeaderUtility.csEditor/Drawers/GenericHeaderEditor.cs renamed to Editor/Drawers/GenericHeaderUtility.cs

@@ -7,23 +7,14 @@
     using UnityEditor;
     using UnityEngine;
     using Object = UnityEngine.Object;
-    
-#if ODIN_INSPECTOR
-    using Sirenix.OdinInspector.Editor;
-#endif
 
     /// <summary>
     /// An extension of Editor that changes name of <see cref="GenericScriptableObject"/> assets in the Inspector header.
     /// For all other assets, it draws header like before.
     /// </summary>
-    public class GenericHeaderEditor : 
-#if ODIN_INSPECTOR
-        OdinEditor
-#else
-        Editor
-#endif
+    public static class GenericHeaderUtility
     {
-        private static readonly Dictionary<TargetInfo, string> _targetTitlesCache = new Dictionary<TargetInfo, string>();
+        private static readonly Dictionary<Object, string> _targetTitlesCache = new Dictionary<Object, string>();
         private static readonly Dictionary<Type, string> _typeNamesCache = new Dictionary<Type, string>();
 
         private static Func<Editor, string, Rect> _drawHeaderGUI;
@@ -62,35 +53,27 @@ private static Func<Object, string> GetTypeName
                 return _getTypeName;
             }
         }
-        
-#if ! ODIN_INSPECTOR
-        protected virtual void OnEnable() { }
-        
-        protected virtual void OnDisable() { }
-#endif
-
-        protected override void OnHeaderGUI()
+
+        public static void OnHeaderGUI(Editor editor)
         {
-            DrawHeaderGUI(this, GetTitle());
+            DrawHeaderGUI(editor, GetTitle(editor));
         }
 
-        private string GetTitle()
+        private static string GetTitle(Editor editor)
         {
-            Type genericType = target.GetType().BaseType;
+            Type genericType = editor.target.GetType().BaseType;
 
-            return targets.Length == 1
-                ? GetOneTitle(genericType)
-                : GetMixedTitle(genericType);
+            return editor.targets.Length == 1
+                ? GetOneTitle(genericType, editor.target)
+                : GetMixedTitle(genericType, editor.targets);
         }
 
-        private string GetOneTitle(Type genericType)
+        private static string GetOneTitle(Type genericType, Object target)
         {
             if (genericType?.IsGenericType != true)
                 return ObjectNames.GetInspectorTitle(target);
-            
-            var targetInfo = new TargetInfo(target);
 
-            if (_targetTitlesCache.TryGetValue(targetInfo, out string title))
+            if (_targetTitlesCache.TryGetValue(target, out string title))
                 return title;
 
             string typeName = GetGenericTypeName(genericType);
@@ -100,14 +83,14 @@ private string GetOneTitle(Type genericType)
                 return $"({typeName})";
 
             title = $"{ObjectNames.NicifyVariableName(target.name)} ({typeName})";
-            _targetTitlesCache.Add(targetInfo, title);
+            _targetTitlesCache.Add(target, title);
             return title;
         }
 
-        private string GetMixedTitle(Type genericType)
+        private static string GetMixedTitle(Type genericType, Object[] targets)
         {
             if (genericType?.IsGenericType != true)
-                return targets.Length + " " + ObjectNames.NicifyVariableName(GetTypeName(target)) + "s";
+                return targets.Length + " " + ObjectNames.NicifyVariableName(GetTypeName(targets[0])) + "s";
 
             return $"{targets.Length} objects of type {GetGenericTypeName(genericType)}";
         }
@@ -122,39 +105,4 @@ private static string GetGenericTypeName(Type genericType)
             return typeName;
         }
     }
-
-    internal readonly struct TargetInfo : IEquatable<TargetInfo>
-    {
-        public readonly Object Target;
-        public readonly string Name;
-
-        public TargetInfo(Object target)
-        {
-            Target = target;
-            Name = target.name;
-        }
-
-        public override bool Equals(object obj)
-        {
-            return obj is TargetInfo info && Equals(info);
-        }
-
-        public bool Equals(TargetInfo p)
-        {
-            return (Target == p.Target) && (Name == p.Name);
-        }
-
-        public override int GetHashCode()
-        {
-            int hash = 17;
-            // ReSharper disable once Unity.NoNullPropagation
-            hash = hash * 23 + Target?.GetHashCode() ?? 0;
-            hash = hash * 23 + Name.GetHashCode();
-            return hash;
-        }
-
-        public static bool operator ==(TargetInfo lhs, TargetInfo rhs) => lhs.Equals(rhs);
-
-        public static bool operator !=(TargetInfo lhs, TargetInfo rhs) => ! lhs.Equals(rhs);
-    }
 }

…itor/Drawers/GenericHeaderEditor.cs.meta …tor/Drawers/GenericHeaderUtility.cs.metaEditor/Drawers/GenericHeaderEditor.cs.meta renamed to Editor/Drawers/GenericHeaderUtility.cs.meta Editor/Drawers/GenericHeaderEditor.cs.meta renamed to Editor/Drawers/GenericHeaderUtility.cs.meta

@@ -1,6 +1,7 @@
 namespace GenericUnityObjects.Editor
 {
     using System;
+    using GenericUnityObjects.Util;
     using SolidUtilities.Editor;
     using UnityEditor;
     using UnityEngine;
@@ -21,7 +22,12 @@ public class GenericUnityObjectHelper
         /// <param name="target">Target object of custom editor.</param>
         public GenericUnityObjectHelper(Object target)
         {
-            _genericType = target.GetType().BaseType;
+            var targetType = target.GetType();
+
+            if (!targetType.FullName.StartsWith(Config.ConcreteClassNamespace))
+                return;
+            
+            _genericType = targetType.BaseType;
 
             if (_genericType?.IsGenericType != true)
                 return;

Editor/Drawers/GenericScriptableObjectEditor.cs

@@ -0,0 +1,11 @@
+namespace GenericUnityObjects.Editor
+{
+    using UnityEditor;
+    using UnityEngine;
+
+#if ! DISABLE_GENERIC_OBJECT_EDITOR
+    [CanEditMultipleObjects]
+    [CustomEditor(typeof(ScriptableObject), true)]
+#endif
+    public class ScriptableObjectEditor : UnityObjectEditor { }
+}

Editor/Drawers/GenericUnityObjectHelper.cs

@@ -1,7 +1,9 @@
 namespace GenericUnityObjects.Editor
 {
     using System.Reflection;
+    using MissingScriptType.Editor;
     using UnityEditor;
+    using UnityEditor.Callbacks;
     using UnityEngine;
 
 #if EASY_BUTTONS
@@ -17,25 +19,29 @@
 #if ! DISABLE_GENERIC_OBJECT_EDITOR
     [CanEditMultipleObjects]
     [CustomEditor(typeof(MonoBehaviour), true)]
-    [InitializeOnLoad]
 #endif
-    public class MonoBehaviourEditor :
+    public class UnityObjectEditor :
 #if ODIN_INSPECTOR
         OdinEditor
 #else
         Editor
 #endif
     {
-#if ODIN_INSPECTOR
-        static MonoBehaviourEditor()
+#if ODIN_INSPECTOR && ! DISABLE_GENERIC_OBJECT_EDITOR
+        [DidReloadScripts(1)]
+        private static void OnScriptsReload()
         {
             // a workaround for bug https://bitbucket.org/sirenix/odin-inspector/issues/833/customeditor-with-editorforchildclasses
             var odinEditorTypeField = typeof(InspectorTypeDrawingConfig).GetField("odinEditorType", BindingFlags.Static | BindingFlags.NonPublic);
-            odinEditorTypeField.SetValue(null, typeof(MonoBehaviourEditor));
+            odinEditorTypeField.SetValue(null, typeof(UnityObjectEditor));
         }
 #endif
 
         private GenericUnityObjectHelper _helper;
+        
+#if MISSING_SCRIPT_TYPE
+        private MissingScriptTypeUtility _missingScriptUtility;
+#endif
 
 #if EASY_BUTTONS
         private ButtonsDrawer _buttonsDrawer;
@@ -52,11 +58,24 @@ void OnEnable()
 #endif
 
             _helper = new GenericUnityObjectHelper(target);
+            
+#if MISSING_SCRIPT_TYPE
+            try
+            {
+                _missingScriptUtility = new MissingScriptTypeUtility(serializedObject);
+            }
+            catch { }
+#endif
 
 #if EASY_BUTTONS
             _buttonsDrawer = new ButtonsDrawer(target);
 #endif
         }
+        
+        protected override void OnHeaderGUI()
+        {
+            GenericHeaderUtility.OnHeaderGUI(this);
+        }
 
         public override void OnInspectorGUI()
         {
@@ -101,6 +120,10 @@ private void DrawMissingScript()
             {
                 EditorGUILayout.PropertyField(serializedObject.FindProperty("m_Script"));
             }
+            
+#if MISSING_SCRIPT_TYPE
+            _missingScriptUtility?.OnInspectorGUI();
+#endif
         }
     }
 }