Fix nullability context handling in RDG (#54354)

captainsafia · web-flow · commit 87cde8081456 · 2024-03-04T21:59:45.000Z
diff --git a/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/StaticRouteHandlerModel.Emitter.cs b/src/Http/Http.Extensions/gen/StaticRouteHandlerModel/StaticRouteHandlerModel.Emitter.cs
@@ -325,7 +325,7 @@ public static void EmitJsonAcceptsMetadata(this Endpoint endpoint, CodeWriter co
             {
                 codeWriter.WriteLine($$"""({{(parameter.IsOptional ? "true" : "false")}}, typeof({{parameter.Type.ToDisplayString(EmitterConstants.DisplayFormatWithoutNullability)}})),""");
             }
-            codeWriter.WriteLine("#nullable restore");
+            codeWriter.WriteLine("#nullable enable");
             codeWriter.Indent--;
             codeWriter.WriteLine("};");
             codeWriter.WriteLine("foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)");
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam.generated.txt
@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
                     #nullable disable
                     (false, typeof(global::System.String[])),
-                    #nullable restore
+                    #nullable enable
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_EmptyQueryValues.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_EmptyQueryValues.generated.txt
@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
                     #nullable disable
                     (false, typeof(global::System.String[])),
-                    #nullable restore
+                    #nullable enable
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_QueryNotPresent.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_QueryNotPresent.generated.txt
@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
                     #nullable disable
                     (false, typeof(global::System.String[])),
-                    #nullable restore
+                    #nullable enable
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam.generated.txt
@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
                     #nullable disable
                     (false, typeof(global::System.String[])),
-                    #nullable restore
+                    #nullable enable
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_JsonBodyOrService_HandlesBothJsonAndService.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_JsonBodyOrService_HandlesBothJsonAndService.generated.txt
@@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                     #nullable disable
                     (false, typeof(global::Microsoft.AspNetCore.Http.Generators.Tests.Todo)),
                     (false, typeof(global::Microsoft.AspNetCore.Http.Generators.Tests.TestService)),
-                    #nullable restore
+                    #nullable enable
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_TakesCustomMetadataEmitter_Has_Metadata.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapAction_TakesCustomMetadataEmitter_Has_Metadata.generated.txt
@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
                     #nullable disable
                     (false, typeof(global::Microsoft.AspNetCore.Http.Generators.Tests.CustomMetadataEmitter)),
-                    #nullable restore
+                    #nullable enable
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Get_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Get_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt
@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
                     #nullable disable
                     (false, typeof(global::System.String[])),
-                    #nullable restore
+                    #nullable enable
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndGet_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndGet_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt
@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
                     #nullable disable
                     (false, typeof(global::System.String[])),
-                    #nullable restore
+                    #nullable enable
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndPut_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_PostAndPut_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
                     #nullable disable
                     (false, typeof(global::System.String[])),
-                    #nullable restore
+                    #nullable enable
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Post_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapMethods_Post_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
                     #nullable disable
                     (false, typeof(global::System.String[])),
-                    #nullable restore
+                    #nullable enable
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
                     #nullable disable
                     (false, typeof(global::System.String[])),
-                    #nullable restore
+                    #nullable enable
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_ShouldFail.generated.txt b/src/Http/Http.Extensions/test/RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_ShouldFail.generated.txt
@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Http.Generated
                 var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {
                     #nullable disable
                     (false, typeof(global::System.String[])),
-                    #nullable restore
+                    #nullable enable
                 };
                 foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)
                 {
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeCreationTests.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeCreationTests.cs
@@ -687,6 +687,7 @@ public static IEndpointRouteBuilder MapPost(this IEndpointRouteBuilder app, int
     public async Task TestHandlingOfGenericWithNullableReferenceTypes()
     {
         var source = """
+#nullable enable
 using System;
 using System.Globalization;
 using Microsoft.AspNetCore.Builder;
diff --git a/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTestBase.cs b/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTestBase.cs
@@ -309,7 +309,7 @@ internal static Project CreateProject(Func<CSharpCompilationOptions, CSharpCompi
     {
         var projectName = $"TestProject-{Guid.NewGuid()}";
         var compilationOptions = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
-                .WithNullableContextOptions(NullableContextOptions.Enable);
+                .WithNullableContextOptions(NullableContextOptions.Disable);
         if (modifyCompilationOptions is not null)
         {
             compilationOptions = modifyCompilationOptions(compilationOptions);

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ public static void EmitJsonAcceptsMetadata(this Endpoint endpoint, CodeWriter co`
`325`	`325`	`{`
`326`	`326`	`codeWriter.WriteLine($$"""({{(parameter.IsOptional ? "true" : "false")}}, typeof({{parameter.Type.ToDisplayString(EmitterConstants.DisplayFormatWithoutNullability)}})),""");`
`327`	`327`	`}`
`328`		`- codeWriter.WriteLine("#nullable restore");`
	`328`	`+ codeWriter.WriteLine("#nullable enable");`
`329`	`329`	`codeWriter.Indent--;`
`330`	`330`	`codeWriter.WriteLine("};");`
`331`	`331`	`codeWriter.WriteLine("foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)");`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ namespace Microsoft.AspNetCore.Http.Generated`
`74`	`74`	`var jsonBodyOrServiceTypeTuples = new (bool, Type)[] {`
`75`	`75`	`#nullable disable`
`76`	`76`	`(false, typeof(global::System.String[])),`
`77`		`- #nullable restore`
	`77`	`+ #nullable enable`
`78`	`78`	`};`
`79`	`79`	`foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)`
`80`	`80`	`{`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Http.Generated`
`75`	`75`	`#nullable disable`
`76`	`76`	`(false, typeof(global::Microsoft.AspNetCore.Http.Generators.Tests.Todo)),`
`77`	`77`	`(false, typeof(global::Microsoft.AspNetCore.Http.Generators.Tests.TestService)),`
`78`		`- #nullable restore`
	`78`	`+ #nullable enable`
`79`	`79`	`};`
`80`	`80`	`foreach (var (isOptional, type) in jsonBodyOrServiceTypeTuples)`
`81`	`81`	`{`