Skip to content

Fix nullability context handling in RDG #54354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2024
Merged

Fix nullability context handling in RDG #54354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Http/Http.Extensions/gen/StaticRouteHandlerModel/StaticRouteHandlerModel.Emitter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)");
Expand Down
2 changes: 1 addition & 1 deletion ...elegateGenerator/Baselines/MapAction_ImplicitQuery_NullableStringArrayParam.generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion ...Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_EmptyQueryValues.generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion .../Baselines/MapAction_ImplicitQuery_NullableStringArrayParam_QueryNotPresent.generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion ...RequestDelegateGenerator/Baselines/MapAction_ImplicitQuery_StringArrayParam.generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion ...teGenerator/Baselines/MapAction_JsonBodyOrService_HandlesBothJsonAndService.generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion ...legateGenerator/Baselines/MapAction_TakesCustomMetadataEmitter_Has_Metadata.generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion .../Baselines/MapMethods_Get_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion ...nes/MapMethods_PostAndGet_WithArrayQueryString_AndBody_ShouldUseQueryString.generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion .../Baselines/MapMethods_PostAndPut_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion ...erator/Baselines/MapMethods_Post_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion ...egateGenerator/Baselines/MapPost_WithArrayQueryString_AndBody_ShouldUseBody.generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion .../RequestDelegateGenerator/Baselines/MapPost_WithArrayQueryString_ShouldFail.generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
1 change: 1 addition & 0 deletions src/Http/Http.Extensions/test/RequestDelegateGenerator/CompileTimeCreationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,7 @@ public static IEndpointRouteBuilder MapPost(this IEndpointRouteBuilder app, int
public async Task TestHandlingOfGenericWithNullableReferenceTypes()
{
var source = """
#nullable enable
Copy link
Member

@BrennanConroy BrennanConroy Mar 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this the only test that tests nullability in user code 😮
Kind of surprising.

Copy link
Member Author

@captainsafia captainsafia Mar 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BrennanConroy The other tests do use nullable annotations but they make use of the source template that is in the base class which enables it there:

aspnetcore/src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTestBase.cs

Line 268 in 2c0ee4c

#nullable enable

using System;
using System.Globalization;
using Microsoft.AspNetCore.Builder;
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Http.Extensions/test/RequestDelegateGenerator/RequestDelegateCreationTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down