Skip to content

Update TryParse code gen to use CodeWriter. #46928

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 7 commits into from
Mar 3, 2023
Merged

Update TryParse code gen to use CodeWriter. #46928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
96d8235
Update TryParse code gen to use CodeWriter.
mitchdenny Feb 28, 2023
2f10820
Update baselines.
mitchdenny Mar 1, 2023
8caa452
Update src/Http/Http.Extensions/gen/StaticRouteHandlerModel/EndpointP…
mitchdenny Feb 28, 2023
f1e5331
Remove unwanted change and remove old baseline files.
mitchdenny Mar 1, 2023
eda0a2d
Removing Trim() from line comparisons to make them more hardcore.
mitchdenny Mar 1, 2023
09046e6
Update baselines after a rebase.
mitchdenny Mar 3, 2023
4ca0feb
Add trim back in until I can investigate a xplat build issue related …
mitchdenny Mar 3, 2023
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
3 changes: 1 addition & 2 deletions src/Http/Http.Extensions/gen/StaticRouteHandlerModel/Emitters/EndpointParameterEmitter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ internal static void EmitParsingBlock(this EndpointParameter endpointParameter,
{
if (endpointParameter.IsParsable)
{
var parsingBlock = endpointParameter.ParsingBlockEmitter(endpointParameter.EmitTempArgument(), endpointParameter.EmitParsedTempArgument());
codeWriter.WriteLine(parsingBlock);
endpointParameter.ParsingBlockEmitter(codeWriter, endpointParameter.EmitTempArgument(), endpointParameter.EmitParsedTempArgument());
codeWriter.WriteLine($"{endpointParameter.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)} {endpointParameter.EmitHandlerArgument()} = {endpointParameter.EmitParsedTempArgument()}!;");
}
else
Expand Down
49 changes: 25 additions & 24 deletions src/Http/Http.Extensions/gen/StaticRouteHandlerModel/EndpointParameter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public EndpointParameter(IParameterSymbol parameter, WellKnownTypes wellKnownTyp
}
}

private bool TryGetParsability(IParameterSymbol parameter, WellKnownTypes wellKnownTypes, [NotNullWhen(true)]out Func<string, string, string>? parsingBlockEmitter)
private bool TryGetParsability(IParameterSymbol parameter, WellKnownTypes wellKnownTypes, [NotNullWhen(true)]out Action<CodeWriter, string, string>? parsingBlockEmitter)
{
var parameterType = parameter.Type.UnwrapTypeSymbol();

Expand Down Expand Up @@ -132,35 +132,36 @@ private bool TryGetParsability(IParameterSymbol parameter, WellKnownTypes wellKn

if (IsOptional)
{
parsingBlockEmitter = (inputArgument, outputArgument) => $$"""
{{parameter.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}} {{outputArgument}} = default;
if ({{preferredTryParseInvocation(inputArgument, $"{inputArgument}_parsed_non_nullable")}})
{
{{outputArgument}} = {{$"{inputArgument}_parsed_non_nullable"}};
}
else if (string.IsNullOrEmpty({{inputArgument}}))
{
{{outputArgument}} = null;
}
else
{
wasParamCheckFailure = true;
}
""";
parsingBlockEmitter = (writer, inputArgument, outputArgument) =>
{
writer.WriteLine($"""{parameter.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)} {outputArgument} = default;""");
writer.WriteLine($$"""if ({{preferredTryParseInvocation(inputArgument, $"{inputArgument}_parsed_non_nullable")}})""");
writer.StartBlock();
writer.WriteLine($$"""{{outputArgument}} = {{$"{inputArgument}_parsed_non_nullable"}};""");
writer.EndBlock();
writer.WriteLine($$"""else if (string.IsNullOrEmpty({{inputArgument}}))""");
writer.StartBlock();
writer.WriteLine($$"""{{outputArgument}} = null;""");
writer.EndBlock();
writer.WriteLine("else");
writer.StartBlock();
writer.WriteLine("wasParamCheckFailure = true;");
writer.EndBlock();
};
}
else
{
parsingBlockEmitter = (inputArgument, outputArgument) => $$"""
if (!{{preferredTryParseInvocation(inputArgument, outputArgument)}})
{
wasParamCheckFailure = true;
}
""";
parsingBlockEmitter = (writer, inputArgument, outputArgument) =>
{
writer.WriteLine($$"""if (!{{preferredTryParseInvocation(inputArgument, outputArgument)}})""");
writer.StartBlock();
writer.WriteLine("wasParamCheckFailure = true;");
writer.EndBlock();
};
}

// Wrap the TryParse method call in an if-block and if it doesn't work set param check failure.
return true;

}

public ITypeSymbol Type { get; }
Expand All @@ -173,7 +174,7 @@ private bool TryGetParsability(IParameterSymbol parameter, WellKnownTypes wellKn
public bool IsOptional { get; }
[MemberNotNull("ParsingBlockEmitter")]
public bool IsParsable { get; }
public Func<string, string, string> ParsingBlockEmitter { get; }
public Action<CodeWriter, string, string> ParsingBlockEmitter { get; }

// TODO: Handle special form types like IFormFileCollection that need special body-reading logic.
private static bool TryGetSpecialTypeAssigningCode(ITypeSymbol type, WellKnownTypes wellKnownTypes, [NotNullWhen(true)] out string? callingCode)
Expand Down
4 changes: 2 additions & 2 deletions ...stDelegateGenerator/Baselines/MapAction_SingleComplexTypeParam_StringReturn.generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ namespace Microsoft.AspNetCore.Http.Generated
wasParamCheckFailure = true;
}
var p_temp = p_raw.ToString();
if (!global::Todo.TryParse(p_temp!, out var p_parsed_temp))
if (!global::Todo.TryParse(p_temp!, out var p_parsed_temp))
{
wasParamCheckFailure = true;
}
Expand All @@ -147,7 +147,7 @@ namespace Microsoft.AspNetCore.Http.Generated
wasParamCheckFailure = true;
}
var p_temp = p_raw.ToString();
if (!global::Todo.TryParse(p_temp!, out var p_parsed_temp))
if (!global::Todo.TryParse(p_temp!, out var p_parsed_temp))
{
wasParamCheckFailure = true;
}
Expand Down
4 changes: 2 additions & 2 deletions ...t/RequestDelegateGenerator/Baselines/MapAction_SingleEnumParam_StringReturn.generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ namespace Microsoft.AspNetCore.Http.Generated
wasParamCheckFailure = true;
}
var p_temp = p_raw.ToString();
if (!Enum.TryParse<global::TodoStatus>(p_temp!, out var p_parsed_temp))
if (!Enum.TryParse<global::TodoStatus>(p_temp!, out var p_parsed_temp))
{
wasParamCheckFailure = true;
}
Expand All @@ -147,7 +147,7 @@ namespace Microsoft.AspNetCore.Http.Generated
wasParamCheckFailure = true;
}
var p_temp = p_raw.ToString();
if (!Enum.TryParse<global::TodoStatus>(p_temp!, out var p_parsed_temp))
if (!Enum.TryParse<global::TodoStatus>(p_temp!, out var p_parsed_temp))
{
wasParamCheckFailure = true;
}
Expand Down
Loading