Improves performance of TypeByName(), adds TypeSearch()

Author: pardeike

Harmony/Tools/AccessTools.cs

@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Text.RegularExpressions;
 using System.Threading;
 #if NET45_OR_GREATER || NETSTANDARD || NETCOREAPP
 using System.Runtime.CompilerServices;
@@ -25,6 +26,8 @@ namespace HarmonyLib
 	///
 	public static class AccessTools
 	{
+		private static Type[] allTypesCached = null;
+
 		/// <summary>Shortcut for <see cref="BindingFlags"/> to simplify the use of reflections and make it work for any access level</summary>
 		///
 		public static readonly BindingFlags all = BindingFlags.Public // This should a be const, but changing from static (readonly) to const breaks binary compatibility.
@@ -51,13 +54,57 @@ public static class AccessTools
 		///
 		public static Type TypeByName(string name)
 		{
-			var type = Type.GetType(name, false);
-			type ??= AllTypes().FirstOrDefault(t => t.FullName == name);
-			type ??= AllTypes().FirstOrDefault(t => t.Name == name);
-			if (type is null) FileLog.Debug($"AccessTools.TypeByName: Could not find type named {name}");
-			return type;
+			var localType = Type.GetType(name, false);
+			if (localType is not null)
+				return localType;
+
+			foreach (var assembly in AllAssemblies())
+			{
+				var specificType = assembly.GetType(name, false);
+				if (specificType is not null)
+					return specificType;
+			}
+
+			var allTypes = AllTypes().ToArray();
+
+			var fullType = allTypes.FirstOrDefault(t => t.FullName == name);
+			if (fullType is not null)
+				return fullType;
+
+			var partialType = allTypes.FirstOrDefault(t => t.Name == name);
+			if (partialType is not null)
+				return partialType;
+
+			FileLog.Debug($"AccessTools.TypeByName: Could not find type named {name}");
+			return null;
 		}
 
+		/// <summary>Searches a type by regular expression. For exact searching, use <see cref="AccessTools.TypeByName(string)"/>.</summary>
+		/// <param name="search">The regular expression that matches against Type.FullName or Type.Name</param>
+		/// <param name="invalidateCache">Refetches the cached types if set to true</param>
+		/// <returns>The first type where FullName or Name matches the search</returns>
+		///
+		public static Type TypeSearch(Regex search, bool invalidateCache = false)
+		{
+			if (allTypesCached == null || invalidateCache)
+				allTypesCached = [.. AllTypes()];
+
+			var fullType = allTypesCached.FirstOrDefault(t => search.IsMatch(t.FullName));
+			if (fullType is not null)
+				return fullType;
+
+			var partialType = allTypesCached.FirstOrDefault(t => search.IsMatch(t.Name));
+			if (partialType is not null)
+				return partialType;
+
+			FileLog.Debug($"AccessTools.TypeSearch: Could not find type with regular expression {search}");
+			return null;
+		}
+
+		/// <summary>Clears the type cache that <see cref="AccessTools.TypeSearch(Regex, bool)"/> uses.</summary>
+		///
+		public static void ClearTypeSearchCache() => allTypesCached = [];
+
 		/// <summary>Gets all successfully loaded types from a given assembly</summary>
 		/// <param name="assembly">The assembly</param>
 		/// <returns>An array of types</returns>

HarmonyTests/GlobalSuppressions.cs

@@ -30,3 +30,4 @@
 [assembly: SuppressMessage("Code Quality", "IDE0051")]
 [assembly: SuppressMessage("Interoperability", "SYSLIB1054")]
 [assembly: SuppressMessage("Obsoletions", "SYSLIB0014")]
+[assembly: SuppressMessage("", "SYSLIB1045")]

HarmonyTests/Tools/TestAccessTools.cs

@@ -6,6 +6,7 @@
 using System.IO;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Text.RegularExpressions;
 using static HarmonyLibTests.Assets.AccessToolsMethodDelegate;
 #if NETCOREAPP
 using System.Linq;
@@ -100,6 +101,14 @@ public void Test_AccessTools_TypeByName_CurrentAssemblies()
 			Assert.Null(AccessTools.TypeByName("IAmALittleTeaPot.ShortAndStout"));
 		}
 
+		[Test, NonParallelizable]
+		public void Test_AccessTools_TypeSearch_CurrentAssemblies()
+		{
+			Assert.NotNull(AccessTools.TypeSearch(new Regex("^HarmonyLib\\.Harmony$")), "Harmony");
+			Assert.NotNull(AccessTools.TypeSearch(new Regex(".+\\.Test_.+Tools$")), "Test_AccessTools");
+			Assert.NotNull(AccessTools.TypeSearch(new Regex("harmony.+?tests\\..+environment", RegexOptions.IgnoreCase)), "HarmonyLibTests.TestEnvironment");
+		}
+
 		[Test, NonParallelizable]
 		public void Test_AccessTools_TypeByName_InvalidAssembly()
 		{