Address feedback

Author: javiercn

src/Validation/gen/Parsers/ValidationsGenerator.AttributeParser.cs

@@ -1,7 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Threading;
@@ -13,12 +11,12 @@ namespace Microsoft.Extensions.Validation;
 
 public sealed partial class ValidationsGenerator : IIncrementalGenerator
 {
-    internal static bool ShouldTransformSymbolWithAttribute(SyntaxNode syntaxNode, CancellationToken _)
+    internal static bool ShouldTransformSymbolWithAttribute(SyntaxNode syntaxNode, CancellationToken cancellationToken)
     {
         return syntaxNode is ClassDeclarationSyntax or RecordDeclarationSyntax;
     }
 
-    internal ImmutableArray<ValidatableType> TransformValidatableTypeWithAttribute(GeneratorAttributeSyntaxContext context, CancellationToken _)
+    internal ImmutableArray<ValidatableType> TransformValidatableTypeWithAttribute(GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken)
     {
         var validatableTypes = new HashSet<ValidatableType>(ValidatableTypeComparer.Instance);
         List<ITypeSymbol> visitedTypes = [];

src/Validation/gen/ValidationsGenerator.cs

@@ -35,10 +35,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
         );
 
         // Combine both sources of validatable types
-        var validatableTypesWithAttribute = frameworkValidatableTypes
-            .Collect()
-            .Combine(generatedValidatableTypes.Collect())
-            .SelectMany((pair, _) => pair.Left.Concat(pair.Right).ToImmutableArray());
+        var validatableTypesWithAttribute = frameworkValidatableTypes.Concat(generatedValidatableTypes);
 
         // Extract all minimal API endpoints in the application.
         var endpoints = context.SyntaxProvider
@@ -52,8 +49,29 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             .Select(ExtractValidatableEndpoint);
 
         // Join all validatable types encountered in the type graph.
-        var validatableTypes = validatableTypesWithAttribute
-            .Concat(validatableTypesFromEndpoints)
+        var allValidatableTypesProviders = validatableTypesWithAttribute
+            .Collect()
+            .Combine(validatableTypesFromEndpoints.Collect())
+            .SelectMany(static (tuple, _) =>
+            {
+                var results = ImmutableArray.CreateBuilder<ValidatableType>();
+                
+                // Add from attribute-based sources
+                foreach (var array in tuple.Left)
+                {
+                    results.AddRange(array);
+                }
+                
+                // Add from endpoint sources
+                foreach (var array in tuple.Right)
+                {
+                    results.AddRange(array);
+                }
+                
+                return results.DrainToImmutable();
+            });
+
+        var validatableTypes = allValidatableTypesProviders
             .Distinct(ValidatableTypeComparer.Instance)
             .Collect();
 
@@ -62,6 +80,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 
         // Emit the IValidatableInfo resolver injection and
         // ValidatableTypeInfo for all validatable types.
-        context.RegisterSourceOutput(emitInputs, Emit);
+        context.RegisterSourceOutput(emitInputs, (context, emitInputs) => 
+            Emit(context, (emitInputs.Left, emitInputs.Right)));
     }
 }

src/Validation/test/Microsoft.Extensions.Validation.GeneratorTests/ValidationsGenerator.AutoGeneratedAttribute.cs

@@ -10,6 +10,25 @@ namespace Microsoft.Extensions.Validation.GeneratorTests;
 [UsesVerify]
 public partial class ValidationsGeneratorTests : ValidationsGeneratorTestBase
 {
+    private const string GeneratedAttributeSource = """
+        // <auto-generated/>
+        namespace Microsoft.CodeAnalysis
+        {
+            [global::System.AttributeUsage(global::System.AttributeTargets.All, AllowMultiple = true, Inherited = false)]
+            internal sealed class EmbeddedAttribute : global::System.Attribute
+            {
+            }
+        }
+
+        namespace Microsoft.Extensions.Validation.Embedded;
+
+        [global::Microsoft.CodeAnalysis.EmbeddedAttribute]
+        [global::System.AttributeUsage(global::System.AttributeTargets.Class)]
+        internal sealed class ValidatableTypeAttribute : global::System.Attribute
+        {
+        }
+        """;
+
     [Fact]
     public async Task CanDiscoverGeneratedValidatableTypeAttribute()
     {
@@ -38,28 +57,8 @@ public class Customer
             app.Run();
             """;
 
-        // Simulate the Razor SDK generating the attribute
-        var generatedAttributeSource = """
-            // <auto-generated/>
-            namespace Microsoft.CodeAnalysis
-            {
-                [global::System.AttributeUsage(global::System.AttributeTargets.All, AllowMultiple = true, Inherited = false)]
-                internal sealed class EmbeddedAttribute : global::System.Attribute
-                {
-                }
-            }
-
-            namespace Microsoft.Extensions.Validation.Embedded;
-
-            [global::Microsoft.CodeAnalysis.EmbeddedAttribute]
-            [global::System.AttributeUsage(global::System.AttributeTargets.Class)]
-            internal sealed class ValidatableTypeAttribute : global::System.Attribute
-            {
-            }
-            """;
-
         // Combine the generated attribute with the user's source
-        var combinedSource = generatedAttributeSource + "\n" + source;
+        var combinedSource = GeneratedAttributeSource + "\n" + source;
 
         await Verify(combinedSource, out var compilation);
     }
@@ -106,28 +105,8 @@ public class Product
             app.Run();
             """;
 
-        // Simulate the Razor SDK generating the attribute
-        var generatedAttributeSource = """
-            // <auto-generated/>
-            namespace Microsoft.CodeAnalysis
-            {
-                [global::System.AttributeUsage(global::System.AttributeTargets.All, AllowMultiple = true, Inherited = false)]
-                internal sealed class EmbeddedAttribute : global::System.Attribute
-                {
-                }
-            }
-
-            namespace Microsoft.Extensions.Validation.Embedded;
-
-            [global::Microsoft.CodeAnalysis.EmbeddedAttribute]
-            [global::System.AttributeUsage(global::System.AttributeTargets.Class)]
-            internal sealed class ValidatableTypeAttribute : global::System.Attribute
-            {
-            }
-            """;
-
         // Combine the generated attribute with the user's source
-        var combinedSource = generatedAttributeSource + "\n" + source;
+        var combinedSource = GeneratedAttributeSource + "\n" + source;
 
         await Verify(combinedSource, out var compilation);
     }