Add config option for including the open generic results and tweak searchcontains slightly

Author: Banane9

ComponentSelectorAdditions/SearchBar.cs

@@ -98,25 +98,31 @@ public void Handle(EnumerateComponentsEvent eventData)
 
             foreach (var result in results.TakeWhile(result => (!result.Component.HasGroup || knownGroups.Add(result.Component.Group) ? --remaining : remaining) >= 0))
             {
-                eventData.AddItem(result.Component, result.Order);
-
-                if (result.Component.IsGeneric && parsedGeneric is not null)
+                if (parsedGeneric is not null && result.Component.IsGeneric)
                 {
                     try
                     {
                         var concreteType = result.Component.Type.MakeGenericType(parsedGeneric);
 
-                        if (!concreteType.IsValidGenericType(true))
-                            continue;
+                        if (concreteType.IsValidGenericType(true))
+                        {
+                            eventData.AddItem(new(result.Component.Category, concreteType), result.Order);
+
+                            if (!ConfigSection.IncludeOpenGenericsWithGenericArgument)
+                                continue;
 
-                        --remaining;
-                        eventData.AddItem(new(result.Component.Category, concreteType), result.Order);
+                            // Decrement remaining a further time for open generic below
+                            if (!result.Component.HasGroup)
+                                --remaining;
+                        }
                     }
                     catch (Exception ex)
                     {
-                        Logger.Warn(ex.LogFormat($"Failed to make generic type for component [{result.Component.NiceName}] with [{parsedGeneric.GetNiceName()}] (from \"{eventData.Path.GenericType}\")!"));
+                        Logger.Debug(ex.LogFormat($"Failed to make generic type for component [{result.Component.NiceName}] with [{parsedGeneric.GetNiceName()}] (from \"{eventData.Path.SearchGeneric}\")!"));
                     }
                 }
+
+                eventData.AddItem(result.Component, result.Order);
             }
 
             eventData.Canceled = true;
@@ -169,7 +175,7 @@ private static IEnumerable<CategoryNode<Type>> SearchCategories(CategoryNode<Typ
         }
 
         private static int SearchContains(string haystack, string[] needles)
-            => needles.Count(needle => CultureInfo.InvariantCulture.CompareInfo.IndexOf(haystack, needle, CompareOptions.IgnoreCase) >= 0);
+            => needles.Count(needle => haystack.IndexOf(needle, 0, StringComparison.OrdinalIgnoreCase) >= 0);
 
         private CategoryNode<Type> PickSearchCategory(IEnumerateSelectorResultEvent eventData)
         {

ComponentSelectorAdditions/SearchConfig.cs

@@ -24,6 +24,8 @@ public sealed class SearchConfig : SingletonConfigSection<SearchConfig>
 
         private static readonly Dictionary<string, bool> _excludedCategories = new(StringComparer.OrdinalIgnoreCase);
 
+        private static readonly DefiningConfigKey<bool> _includeOpenGenericsWithGenericArgument = new("IncludeOpenGenericsWithGenericArgument", "Include the open generic versions of components / nodes in the results even when the generic argument can be applied to them successfully.", () => false);
+
         private static readonly DefiningConfigKey<int> _maxResultCount = new("MaxResultCount", "The maximum number of component / node results to display. 'Better' results are listed first. Categories don't count.", () => 64)
         {
             new ConfigKeyRange<int>(1, 128)
@@ -35,6 +37,7 @@ public sealed class SearchConfig : SingletonConfigSection<SearchConfig>
         };
 
         private static readonly DefiningConfigKey<string> _userExcludedCategories = new("UserExcludedCategories", "Excludes specific categories from being searched into by path (case sensitive). Separate entries by semicolon. Search will work when started inside them.", () => "/ProtoFlux");
+
         private static readonly char[] _userExclusionSeparator = new[] { ';' };
 
         /// <summary>
@@ -48,6 +51,12 @@ public sealed class SearchConfig : SingletonConfigSection<SearchConfig>
         /// <inheritdoc/>
         public override string Id => "Search";
 
+        /// <summary>
+        /// Gets whether the open generic versions of components / nodes should be included in the results
+        /// even when the generic argument can be applied to them successfully.
+        /// </summary>
+        public bool IncludeOpenGenericsWithGenericArgument => _includeOpenGenericsWithGenericArgument;
+
         /// <summary>
         /// Gets how many results will be listed at most.
         /// </summary>