Avoid Linq allocations from usage of Union (#4265)

microsoft · Dec 7, 2024 · d269367 · d269367
1 parent beb890d
commit d269367
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOptionsValidator.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOptionsValidator.cs
@@ -225,12 +225,24 @@ private static async Task<ValidationResult> ValidateOptionsArgumentsAsync(
     }
 
     private static async Task<ValidationResult> ValidateConfigurationAsync(
-        IEnumerable<ICommandLineOptionsProvider> extensionsProviders,
-        IEnumerable<ICommandLineOptionsProvider> systemProviders,
+        Dictionary<ICommandLineOptionsProvider, IReadOnlyCollection<CommandLineOption>>.KeyCollection extensionsProviders,
+        Dictionary<ICommandLineOptionsProvider, IReadOnlyCollection<CommandLineOption>>.KeyCollection systemProviders,
         ICommandLineOptions commandLineOptions)
     {
-        StringBuilder? stringBuilder = null;
-        foreach (ICommandLineOptionsProvider commandLineOptionsProvider in systemProviders.Union(extensionsProviders))
+        StringBuilder? stringBuilder = await ValidateConfigurationAsync(systemProviders, commandLineOptions, null);
+        stringBuilder = await ValidateConfigurationAsync(extensionsProviders, commandLineOptions, stringBuilder);
+
+        return stringBuilder?.Length > 0
+            ? ValidationResult.Invalid(stringBuilder.ToTrimmedString())
+            : ValidationResult.Valid();
+    }
+
+    private static async Task<StringBuilder?> ValidateConfigurationAsync(
+        Dictionary<ICommandLineOptionsProvider, IReadOnlyCollection<CommandLineOption>>.KeyCollection providers,
+        ICommandLineOptions commandLineOptions,
+        StringBuilder? stringBuilder)
+    {
+        foreach (ICommandLineOptionsProvider commandLineOptionsProvider in providers)
         {
             ValidationResult result = await commandLineOptionsProvider.ValidateCommandLineOptionsAsync(commandLineOptions);
             if (!result.IsValid)
@@ -241,9 +253,7 @@ private static async Task<ValidationResult> ValidateConfigurationAsync(
             }
         }
 
-        return stringBuilder?.Length > 0
-            ? ValidationResult.Invalid(stringBuilder.ToTrimmedString())
-            : ValidationResult.Valid();
+        return stringBuilder;
     }
 
     private static string ToTrimmedString(this StringBuilder stringBuilder)