Merge branch 'ext-events-improvements' into main

Author: SolidAlloy

.images/dynamic-serialized-dropdown.png

@@ -121,8 +121,8 @@ private static void GetCodeToGenerate(out HashSet<CreateMethod> methods, out Has
             methods = new HashSet<CreateMethod>();
             argumentTypes = new HashSet<Type>();
 
-            var serializedObjects = SerializedObjectFinder.GetSerializedObjects();
-            var extEventProperties = ExtEventProjectSearcher.FindExtEventProperties(serializedObjects);
+            var serializedObjects = ProjectWideSearcher.GetSerializedObjectsInProject();
+            var extEventProperties = SerializedPropertyHelper.FindPropertiesOfType(serializedObjects, "ExtEvent");
             var methodInfos = ExtEventProjectSearcher.GetMethods(extEventProperties);
 
             foreach (var methodInfo in methodInfos)

.images/no-elements.png

@@ -8,7 +8,7 @@
     public class BuildPreprocessor : IPreprocessBuildWithReport
     {
         public int callbackOrder => EditorPackageSettings.BuildCallbackOrder;
-        
+
         public void OnPreprocessBuild(BuildReport report)
         {
             if (PlayerSettings.GetScriptingBackend(EditorUserBuildSettings.selectedBuildTargetGroup) !=
@@ -18,7 +18,7 @@ public void OnPreprocessBuild(BuildReport report)
                 return;
             }
 
-#if UNITY_2021_1_OR_NEWER
+#if UNITY_2021_2_OR_NEWER
             switch (EditorUserBuildSettings.il2CppCodeGeneration)
             {
                 case Il2CppCodeGeneration.OptimizeSpeed:

.images/one-dynamic-arg.png

@@ -4,24 +4,13 @@
     using System.Collections.Generic;
     using System.Reflection;
     using SolidUtilities;
+    using SolidUtilities.Editor;
     using TypeReferences;
     using UnityEditor;
     using UnityEngine.Events;
 
     public static class ExtEventProjectSearcher
     {
-        public static IEnumerable<SerializedProperty> FindExtEventProperties(
-            IEnumerable<SerializedObject> serializedObjects)
-        {
-            foreach (var serializedObject in serializedObjects)
-            {
-                foreach (var serializedProperty in FindExtEventProperties(serializedObject))
-                {
-                    yield return serializedProperty;
-                }
-            }
-        }
-        
         public static IEnumerable<MethodInfo> GetMethods(IEnumerable<SerializedProperty> extEventProperties)
         {
             foreach (var extEventProperty in extEventProperties)
@@ -40,35 +29,6 @@ public static IEnumerable<MethodInfo> GetMethods(IEnumerable<SerializedProperty>
             }
         }
 
-        private static IEnumerable<SerializedProperty> FindExtEventProperties(SerializedObject serializedObject)
-        {
-            var prop = serializedObject.GetIterator();
-
-            if (!prop.Next(true))
-                yield break;
-
-            do
-            {
-                if (prop.type.GetSubstringBefore('`') != "ExtEvent") 
-                    continue;
-                
-                if (prop.isArray)
-                {
-                    int arrayLength = prop.arraySize;
-
-                    for (int i = 0; i < arrayLength; i++)
-                    {
-                        yield return prop.GetArrayElementAtIndex(i);
-                    }
-                }
-                else
-                {
-                    yield return prop;
-                }
-            }
-            while (prop.NextVisible(true));
-        }
-
         private static class ResponseHelper
         {
             public static MethodInfo GetMethod(SerializedProperty response)