Fix up formatting for generic types with nullable args

src/Http/Http.Extensions/gen/StaticRouteHandlerModel/StaticRouteHandlerModel.Emitter.cs

@@ -320,10 +320,12 @@ public static void EmitJsonAcceptsMetadata(this Endpoint endpoint, CodeWriter co
 
             codeWriter.WriteLine("var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {");
             codeWriter.Indent++;
+            codeWriter.WriteLine("#nullable disable");
             foreach (var parameter in potentialImplicitBodyParameters)
             {
                 codeWriter.WriteLine($$"""({{(parameter.IsOptional ? "true" : "false")}}, typeof({{parameter.Type.ToDisplayString(EmitterConstants.DisplayFormatWithoutNullability)}})),""");
             }
+            codeWriter.WriteLine("#nullable restore");
             codeWriter.Indent--;
             codeWriter.WriteLine("};");
             codeWriter.WriteLine("foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)");

src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam.generated.txt

@@ -72,7 +72,9 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
                 var serviceProviderIsService = serviceProvider.GetRequiredService<IServiceProviderIsService>();
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
+                    #nullable disable
                     (false, typeof(global::System.String[])),
+                    #nullable restore
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {

src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_EmptyQueryValues.generated.txt

@@ -72,7 +72,9 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
                 var serviceProviderIsService = serviceProvider.GetRequiredService<IServiceProviderIsService>();
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
+                    #nullable disable
                     (false, typeof(global::System.String[])),
+                    #nullable restore
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {

src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_QueryNotPresent.generated.txt

@@ -72,7 +72,9 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
                 var serviceProviderIsService = serviceProvider.GetRequiredService<IServiceProviderIsService>();
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
+                    #nullable disable
                     (false, typeof(global::System.String[])),
+                    #nullable restore
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {

src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam.generated.txt

@@ -72,7 +72,9 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
                 var serviceProviderIsService = serviceProvider.GetRequiredService<IServiceProviderIsService>();
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
+                    #nullable disable
                     (false, typeof(global::System.String[])),
+                    #nullable restore
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {

src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_JsonBodyOrService_HandlesBothJsonAndService.generated.txt

@@ -72,8 +72,10 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
                 var serviceProviderIsService = serviceProvider.GetRequiredService<IServiceProviderIsService>();
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
+                    #nullable disable
                     (false, typeof(global::Microsoft.AspNetCore.Http.Generators.Tests.Todo)),
                     (false, typeof(global::Microsoft.AspNetCore.Http.Generators.Tests.TestService)),
+                    #nullable restore
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {

src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_TakesCustomMetadataEmitter_Has_Metadata.generated.txt

@@ -72,7 +72,9 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
                 var serviceProviderIsService = serviceProvider.GetRequiredService<IServiceProviderIsService>();
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
+                    #nullable disable
                     (false, typeof(global::Microsoft.AspNetCore.Http.Generators.Tests.CustomMetadataEmitter)),
+                    #nullable restore
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {

src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Get_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt

@@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Http.Generated
     file static class GeneratedRouteBuilderExtensionsCore
     {
         private static readonly JsonOptions FallbackJsonOptions = new();
-        
+
         [InterceptsLocation(@"TestMapActions.cs", 26, 13)]
         internal static RouteHandlerBuilder MapMethods0(
             this IEndpointRouteBuilder endpoints,
@@ -72,7 +72,9 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
                 var serviceProviderIsService = serviceProvider.GetRequiredService<IServiceProviderIsService>();
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
+                    #nullable disable
                     (false, typeof(global::System.String[])),
+                    #nullable restore
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {

src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndGet_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt

@@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Http.Generated
     file static class GeneratedRouteBuilderExtensionsCore
     {
         private static readonly JsonOptions FallbackJsonOptions = new();
-        
+
         [InterceptsLocation(@"TestMapActions.cs", 26, 13)]
         internal static RouteHandlerBuilder MapMethods0(
             this IEndpointRouteBuilder endpoints,
@@ -72,7 +72,9 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
                 var serviceProviderIsService = serviceProvider.GetRequiredService<IServiceProviderIsService>();
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
+                    #nullable disable
                     (false, typeof(global::System.String[])),
+                    #nullable restore
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {

src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndPut_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt

@@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Http.Generated
     file static class GeneratedRouteBuilderExtensionsCore
     {
         private static readonly JsonOptions FallbackJsonOptions = new();
-        
+
         [InterceptsLocation(@"TestMapActions.cs", 26, 13)]
         internal static RouteHandlerBuilder MapMethods0(
             this IEndpointRouteBuilder endpoints,
@@ -72,7 +72,9 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
                 var serviceProviderIsService = serviceProvider.GetRequiredService<IServiceProviderIsService>();
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
+                    #nullable disable
                     (false, typeof(global::System.String[])),
+                    #nullable restore
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {

src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Post_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt

@@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Http.Generated
     file static class GeneratedRouteBuilderExtensionsCore
     {
         private static readonly JsonOptions FallbackJsonOptions = new();
-        
+
         [InterceptsLocation(@"TestMapActions.cs", 26, 13)]
         internal static RouteHandlerBuilder MapMethods0(
             this IEndpointRouteBuilder endpoints,
@@ -72,7 +72,9 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
                 var serviceProviderIsService = serviceProvider.GetRequiredService<IServiceProviderIsService>();
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
+                    #nullable disable
                     (false, typeof(global::System.String[])),
+                    #nullable restore
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {

src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt

@@ -72,7 +72,9 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
                 var serviceProviderIsService = serviceProvider.GetRequiredService<IServiceProviderIsService>();
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
+                    #nullable disable
                     (false, typeof(global::System.String[])),
+                    #nullable restore
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {

src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_ShouldFail.generated.txt

@@ -72,7 +72,9 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var serviceProvider = options.ServiceProvider ?? options.EndpointBuilder.ApplicationServices;
                 var serviceProviderIsService = serviceProvider.GetRequiredService<IServiceProviderIsService>();
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
+                    #nullable disable
                     (false, typeof(global::System.String[])),
+                    #nullable restore
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {

src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeCreationTests.cs

@@ -627,4 +627,58 @@ public static IEndpointRouteBuilder MapPost(this IEndpointRouteBuilder app, int
         var result = Assert.IsType<GeneratorRunResult>(Assert.Single(generatorRunResult.Results));
         Assert.Empty(GetStaticEndpoints(result, GeneratorSteps.EndpointModelStep));
     }
+
+    [Fact]
+    public async Task TestHandlingOfGenericWithNullableReferenceTypes()
+    {
+        var source = """
+using System;
+using System.Globalization;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Routing;
+
+namespace TestApp
+{
+    public static class TestMapActions
+    {
+        public static IEndpointRouteBuilder MapTestEndpoints(this IEndpointRouteBuilder app)
+        {
+            app.MapGet("/", (IGenericService<SomeInput, string?> service)
+                => "Maybe? " + service.Get(new SomeInput(Random.Shared.Next())));
+            return app;
+        }
+    }
+
+    public interface IInputConstraint<TOutput>;
+
+    public interface IGenericService<TInput, TOutput> where TInput : IInputConstraint<TOutput>
+    {
+        TOutput Get(TInput input);
+    }
+
+    public record SomeInput(int Value) : IInputConstraint<string?>;
+
+    public class ConcreteService : IGenericService<SomeInput, string?>
+    {
+        public string? Get(SomeInput input) => input.Value % 2 == 0 ? input.Value.ToString(CultureInfo.InvariantCulture) : null;
+    }
+}
+""";
+        var project = CreateProject();
+        project = project.AddDocument("TestMapActions.cs", SourceText.From(source, Encoding.UTF8)).Project;
+        var compilation = await project.GetCompilationAsync();
+
+        var generator = new RequestDelegateGenerator.RequestDelegateGenerator().AsSourceGenerator();
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(generators: new[]
+            {
+                generator
+            },
+            driverOptions: new GeneratorDriverOptions(IncrementalGeneratorOutputKind.None, trackIncrementalGeneratorSteps: true),
+            parseOptions: ParseOptions);
+        driver = driver.RunGeneratorsAndUpdateCompilation(compilation, out var updatedCompilation,
+            out var _);
+
+        var diagnostics = updatedCompilation.GetDiagnostics();
+        Assert.Empty(diagnostics.Where(d => d.Severity >= DiagnosticSeverity.Warning));
+    }
 }