Merge branch 'ext-events-improvements'

Author: Artem Perepelytsia

Editor/Drawers/TypeFieldDrawer.cs

@@ -116,12 +116,22 @@ private void DrawFieldContent(int controlID)
         {
             int indexOfComma = _serializedTypeRef.TypeNameAndAssembly.IndexOf(',');
             string fullTypeName = indexOfComma == -1 ? string.Empty : _serializedTypeRef.TypeNameAndAssembly.Substring(0, indexOfComma);
-            GUIContent fieldContent = GUIContentHelper.Temp(GetTypeToShow(fullTypeName));
+            GUIContent fieldContent = GUIContentHelper.Temp(GetTypeToShow(fullTypeName, out bool typeExists));
+
+            var previousColor = GUI.backgroundColor;
+            
+            if (!typeExists) 
+                GUI.backgroundColor = new Color(1f, 0f, 0f, .5f);
+
             EditorStyles.popup.Draw(_position, fieldContent, controlID);
+            
+            GUI.backgroundColor = previousColor;
         }
 
-        private string GetTypeToShow(string typeName)
+        private string GetTypeToShow(string typeName, out bool typeExists)
         {
+            typeExists = true;
+            
             if (ProjectSettings.UseBuiltInNames)
             {
                 string builtInName = typeName.ReplaceWithBuiltInName();
@@ -136,7 +146,10 @@ private string GetTypeToShow(string typeName)
                 return DropdownWindow.NoneElementName;
 
             if (TypeCache.GetType(_serializedTypeRef.TypeNameAndAssembly) == null)
+            {
+                typeExists = false;
                 return typeName + MissingSuffix;
+            }
 
             return typeName;
         }

Editor/Util/SerializedTypeReference.cs

@@ -14,13 +14,15 @@ internal readonly struct SerializedTypeReference
         private readonly SerializedObject _parentObject;
         private readonly SerializedProperty _guidProperty;
         private readonly SerializedProperty _guidAssignmentFailedProperty;
+        private readonly SerializedProperty _suppressLogs;
 
         public SerializedTypeReference(SerializedProperty typeReferenceProperty)
         {
             _parentObject = typeReferenceProperty.serializedObject;
             TypeNameProperty = typeReferenceProperty.FindPropertyRelative(nameof(TypeReference._typeNameAndAssembly));
             _guidProperty = typeReferenceProperty.FindPropertyRelative(nameof(TypeReference.GUID));
             _guidAssignmentFailedProperty = typeReferenceProperty.FindPropertyRelative(nameof(TypeReference.GuidAssignmentFailed));
+            _suppressLogs = typeReferenceProperty.FindPropertyRelative(nameof(TypeReference._suppressLogs));
 
             FindGuidIfAssignmentFailed();
         }
@@ -31,17 +33,39 @@ public string TypeNameAndAssembly
             set => SetTypeNameAndAssembly(value);
         }
 
+        public bool SuppressLogs
+        {
+            get => _suppressLogs.boolValue;
+            set
+            {
+                _suppressLogs.boolValue = value;
+                _parentObject.ApplyModifiedProperties();
+            }
+        }
+
         public bool TypeNameHasMultipleDifferentValues => TypeNameProperty.hasMultipleDifferentValues;
 
         private bool GuidAssignmentFailed
         {
             get => _guidAssignmentFailedProperty.boolValue;
             // Used in C# 8
-            [UsedImplicitly] set => SetGUIDAssignmentFailed(value);
+            [UsedImplicitly]
+            set
+            {
+                _guidAssignmentFailedProperty.boolValue = value;
+                _parentObject.ApplyModifiedProperties();
+            }
         }
 
         // Used in C# 8
-        [UsedImplicitly] private string GUID { set => SetGUID(value); }
+        [UsedImplicitly] private string GUID
+        {
+            set
+            {
+                _guidProperty.stringValue = value;
+                _parentObject.ApplyModifiedProperties();
+            }
+        }
 
         [SuppressMessage("ReSharper", "MemberCanBePrivate.Global",
             Justification = "The method is used by TypeFieldDrawer in C# 7")]
@@ -59,18 +83,6 @@ public void SetType(Type type)
             _parentObject.ApplyModifiedProperties();
         }
 
-        private void SetGUIDAssignmentFailed(bool value)
-        {
-            _guidAssignmentFailedProperty.boolValue = value;
-            _parentObject.ApplyModifiedProperties();
-        }
-
-        private void SetGUID(string value)
-        {
-            _guidProperty.stringValue = value;
-            _parentObject.ApplyModifiedProperties();
-        }
-
         private static string GetClassGuidFromTypeName(string typeName)
         {
             var type = Type.GetType(typeName);

Runtime/AssemblyInfo.cs

@@ -4,4 +4,5 @@
 [assembly: InternalsVisibleTo("TypeReferences.Editor.Tests")]
 [assembly: InternalsVisibleTo("GenericUnityObjects")]
 [assembly: InternalsVisibleTo("GenericUnityObjects.Editor")]
+[assembly: InternalsVisibleTo("ExtEvents")]
 [assembly: InternalsVisibleTo("ExtEvents.Editor")]

Runtime/TypeReference.Editor.cs

@@ -1,12 +1,17 @@
 namespace TypeReferences
 {
     using System;
+    using System.Collections.Generic;
+    using System.Diagnostics;
     using System.Linq;
     using Debug = UnityEngine.Debug;
 
 #if UNITY_EDITOR
     using SolidUtilities.Editor;
     using UnityEditor;
+    using UnityEditor.SceneManagement;
+    using UnityEngine;
+    using UnityEngine.SceneManagement;
 #endif
 
     // This part of the class contains only the methods that are meant to be executed in Editor and not in builds.
@@ -31,7 +36,7 @@ private void UnsubscribeFromDelayCall()
         private static string GetGUIDFromType(Type type)
         {
 #if UNITY_EDITOR
-            return AssetSearcher.GetClassGUID(type);
+            return AssetHelper.GetClassGUID(type);
 #else
             return string.Empty;
 #endif
@@ -71,18 +76,33 @@ private void TryUpdatingTypeUsingGUID()
 #endif
         }
 
-        private void ReportObjectsWithMissingValue()
+        [Conditional("UNITY_EDITOR")]
+        private static void ReportObjectsWithMissingValue(string typeName)
         {
 #if UNITY_EDITOR
-            var foundObjects = AssetSearcher.FindObjectsWithValue(nameof(_typeNameAndAssembly), _typeNameAndAssembly);
-            Debug.Log("The value is set in the following objects:");
+            bool firstLineLogged = false;
 
-            foreach (FoundObject foundObject in foundObjects)
+            var serializedObjects = ProjectDependencySearcher.GetSerializedObjectsFromOpenScenes(new ProjectDependencySearcher.FoundObjects());
+            var typeReferenceProperties = SerializedPropertyHelper.FindPropertiesOfType(serializedObjects, "TypeReference");
+
+            foreach (var typeReferenceProperty in typeReferenceProperties)
             {
-                var details = foundObject
-                    .Select(detail => $"{detail.Key}: {detail.Value}");
+                if (typeReferenceProperty.FindPropertyRelative(nameof(_typeNameAndAssembly)).stringValue != typeName
+                    || typeReferenceProperty.FindPropertyRelative(nameof(_suppressLogs)).boolValue) // also don't report the missing type if the logs were suppressed for this TypeReference instance.
+                {
+                    continue;
+                }
+
+                var targetObject = typeReferenceProperty.serializedObject.targetObject;
 
-                Debug.Log($"[{foundObject.Type}] {string.Join(", ", details)}");
+                // Log the first message only if any objects with missing value were found.
+                if (!firstLineLogged)
+                {
+                    Debug.LogWarning($"'{typeName}' was referenced but such type was not found. The value was set in the following objects:");
+                    firstLineLogged = true;
+                }
+                
+                Debug.Log($"<a>{targetObject.name}{(targetObject is MonoBehaviour ? $".{targetObject.GetType().Name}" : string.Empty)}</a>");
             }
 #endif
         }

Runtime/TypeReference.cs

@@ -22,7 +22,7 @@ public partial class TypeReference : ISerializationCallbackReceiver
         [SerializeField] internal string _typeNameAndAssembly;
         public string TypeNameAndAssembly => _typeNameAndAssembly;
 
-        [SerializeField] private bool _suppressLogs;
+        [SerializeField] internal bool _suppressLogs;
 
         private Type _type;
 
@@ -182,8 +182,7 @@ private void LogTypeNotFound()
             if (_reportedMissingValues.Contains(_typeNameAndAssembly))
                 return;
 
-            Debug.LogWarning($"'{_typeNameAndAssembly}' was referenced but such type was not found.");
-            ReportObjectsWithMissingValue();
+            ReportObjectsWithMissingValue(_typeNameAndAssembly);
             _reportedMissingValues.Add(_typeNameAndAssembly);
         }
 

package.json

@@ -4,7 +4,7 @@
   "displayName": "Type References",
   "description": "A plugin that allows selecting a type from a drop-down menu in the inspector.",
   "dependencies": {
-    "com.solidalloy.util": "1.35.0",
+    "com.solidalloy.util": "1.37.0",
     "com.unity.settings-manager": "1.0.3",
     "com.solidalloy.unity-dropdown": "1.1.1"
   },