Fix handling of enum default values in RDF and RDG #63086
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1801,7 +1801,7 @@ private static Expression BindParameterFromValue(ParameterInfo parameter, Expres | |
| ? Expression.IfThen(TempSourceStringNotNullExpr, tryParseExpression) | ||
| : Expression.IfThenElse(TempSourceStringNotNullExpr, tryParseExpression, | ||
| Expression.Assign(argument, | ||
| CreateDefaultValueExpression(parameter.DefaultValue, parameter.ParameterType))); | ||
|
|
||
| var loopExit = Expression.Label(); | ||
|
|
||
|
|
@@ -1963,7 +1963,7 @@ private static Expression BindParameterFromExpression( | |
| return Expression.Block( | ||
| Expression.Condition(Expression.NotEqual(valueExpression, Expression.Constant(null)), | ||
| valueExpression, | ||
| Expression.Convert(CreateDefaultValueExpression(parameter.DefaultValue, parameter.ParameterType), parameter.ParameterType))); | ||
| } | ||
|
|
||
| private static Expression BindParameterFromProperty(ParameterInfo parameter, MemberExpression property, PropertyInfo itemProperty, string key, RequestDelegateFactoryContext factoryContext, string source) | ||
|
|
@@ -1981,6 +1981,41 @@ private static Expression BindParameterFromProperty(ParameterInfo parameter, Mem | |
| type == typeof(StringValues?) ? typeof(StringValues?) : | ||
| null; | ||
|
|
||
| private static Expression CreateDefaultValueExpression(object? defaultValue, Type parameterType) | ||
| { | ||
| if (defaultValue is null) | ||
| { | ||
| return Expression.Constant(null, parameterType); | ||
| } | ||
|
|
||
| var underlyingType = Nullable.GetUnderlyingType(parameterType); | ||
| var isNullable = underlyingType != null; | ||
| var targetType = isNullable ? underlyingType! : parameterType; | ||
| var converted = defaultValue; | ||
|
|
||
| // Apply a conversion for scenarios where the default value's type | ||
| // doesn't match the parameter type | ||
| if (targetType.IsEnum && defaultValue.GetType() != targetType) | ||
| { | ||
| converted = Enum.ToObject(targetType, defaultValue); | ||
| } | ||
| else if (!targetType.IsAssignableFrom(defaultValue.GetType())) | ||
| { | ||
| try | ||
| { | ||
| converted = Convert.ChangeType(defaultValue, targetType, CultureInfo.InvariantCulture); | ||
| } | ||
| catch | ||
| { | ||
| converted = targetType.IsValueType ? Activator.CreateInstance(targetType) : null; | ||
| } | ||
| } | ||
|
|
||
| var constant = Expression.Constant(converted, targetType); | ||
| // Cast nullable types as needed | ||
| return isNullable ? Expression.Convert(constant, parameterType) : constant; | ||
| } | ||
|
|
||
| private static Expression BindParameterFromRouteValueOrQueryString(ParameterInfo parameter, string key, RequestDelegateFactoryContext factoryContext) | ||
| { | ||
| var routeValue = GetValueFromProperty(RouteValuesExpr, RouteValuesIndexerProperty, key); | ||
|
|
@@ -2358,7 +2393,7 @@ private static Expression BindParameterFromBody(ParameterInfo parameter, bool al | |
| { | ||
| // Convert(bodyValue ?? SomeDefault, Todo) | ||
| return Expression.Convert( | ||
| Expression.Coalesce(BodyValueExpr, CreateDefaultValueExpression(parameter.DefaultValue, typeof(object))), | ||
|
There was a problem hiding this comment.
|
||
| parameter.ParameterType); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -177,11 +177,27 @@ public static string GetDefaultValueString(this IParameterSymbol parameterSymbol | |
| { | ||
| return !parameterSymbol.HasExplicitDefaultValue | ||
| ? "null" | ||
| : InnerGetDefaultValueString(parameterSymbol.ExplicitDefaultValue, parameterSymbol.Type); | ||
| } | ||
|
|
||
| private static string InnerGetDefaultValueString(object? defaultValue, ITypeSymbol parameterType) | ||
| { | ||
| // Handle enum types with proper casting | ||
| if (IsEnumType(parameterType, out var enumType)) | ||
| { | ||
| return $"({enumType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}){SymbolDisplay.FormatPrimitive(defaultValue!, false, false)}"; | ||
| } | ||
|
|
||
| // Handle nullable enum types | ||
| if (IsNullableEnumType(parameterType, out var underlyingEnumType)) | ||
| { | ||
| if (defaultValue == null) | ||
| { | ||
| return "default"; | ||
| } | ||
| return $"({underlyingEnumType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}){SymbolDisplay.FormatPrimitive(defaultValue!, false, false)}"; | ||
| } | ||
|
|
||
| return defaultValue switch | ||
| { | ||
| string s => SymbolDisplay.FormatLiteral(s, true), | ||
|
|
@@ -227,4 +243,26 @@ public static string GetParameterInfoFromConstructorCode(this IParameterSymbol p | |
| } | ||
| return "null"; | ||
| } | ||
|
|
||
| private static bool IsEnumType(ITypeSymbol typeSymbol, out ITypeSymbol enumType) | ||
| { | ||
| enumType = typeSymbol; | ||
| return typeSymbol.TypeKind == TypeKind.Enum; | ||
| } | ||
|
|
||
| private static bool IsNullableEnumType(ITypeSymbol typeSymbol, out ITypeSymbol underlyingEnumType) | ||
| { | ||
| underlyingEnumType = null!; | ||
captainsafia marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
BrennanConroy marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| if (typeSymbol.OriginalDefinition?.SpecialType == SpecialType.System_Nullable_T && | ||
| typeSymbol is INamedTypeSymbol namedType) | ||
| { | ||
| var underlyingType = namedType.TypeArguments.FirstOrDefault(); | ||
| if (underlyingType?.TypeKind == TypeKind.Enum) | ||
| { | ||
| underlyingEnumType = underlyingType; | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When would this happen?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, I think we can get rid of this case. The
Convert.ChangeTypecan throw if the conversion is not supported (which I think our IsAssignableFrom covers) or if the conversion overflows (which I don't think can functionally happen if the compiler catches you doing something likeshort foo = 523525242.