Skip to content

Commit 8d81f5d

Browse files
PhenXCopilot
andauthored
Potential fix for pull request finding
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
1 parent c0b8ab6 commit 8d81f5d

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

src/EntityFrameworkCore.Projectables.Generator/SyntaxRewriters/ExpressionSyntaxRewriter.NullConditionalRewrite.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,14 @@ internal partial class ExpressionSyntaxRewriter
3333
}
3434

3535
var typeInfo = _semanticModel.GetTypeInfo(node);
36+
var whenNotNullType = _semanticModel.GetTypeInfo(node.WhenNotNull).Type;
3637
if (IsCoalesceLeftOperand(node) &&
3738
typeInfo.ConvertedType is INamedTypeSymbol { IsValueType: true, OriginalDefinition.SpecialType: SpecialType.System_Nullable_T } nullableType &&
38-
_semanticModel.GetTypeInfo(node.WhenNotNull).Type is { IsValueType: true } rewrittenType &&
39-
SymbolEqualityComparer.Default.Equals(nullableType.TypeArguments[0], rewrittenType))
39+
whenNotNullType is { IsValueType: true } rewrittenType &&
40+
(
41+
SymbolEqualityComparer.Default.Equals(nullableType.TypeArguments[0], rewrittenType) ||
42+
SymbolEqualityComparer.Default.Equals(nullableType, rewrittenType)
43+
))
4044
{
4145
return SyntaxFactory.CastExpression(
4246
SyntaxFactory.ParseTypeName(nullableType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)),

0 commit comments

Comments
 (0)