zoriya/EntityFrameworkCore.Projectables
1
0
Fork 0
mirror of https://github.com/zoriya/EntityFrameworkCore.Projectables.git synced 2026-08-15 18:44:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for projectable instance members returning complex types

Browse Source
This commit is contained in:
Koen Bekkenutte
2021-11-26 19:53:18 +08:00
parent f03aa16680
commit af76e5b0a0
4 changed files with 113 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/EntityFrameworkCore.Projectables.Generator/ExpressionSyntaxRewriter.cs
+18 -6
View File
@@ -126,23 +126,35 @@ namespace EntityFrameworkCore.Projectables.Generator
{
if (symbolInfo.Symbol is IMethodSymbol methodSymbol && methodSymbol.IsExtensionMethod)
{
}
else if (symbolInfo.Symbol.Kind is SymbolKind.Property or SymbolKind.Method or SymbolKind.Field && SymbolEqualityComparer.Default.Equals(symbolInfo.Symbol.ContainingType, _targetTypeSymbol))
{
bool rewrite = true;
if (node.Parent is MemberAccessExpressionSyntax parentMemberAccessNode)
{
var targetSymbolInfo = _semanticModel.GetSymbolInfo(parentMemberAccessNode.Expression);
if (targetSymbolInfo.Symbol is { Kind: SymbolKind.Parameter })
{
return base.VisitIdentifierName(node);
rewrite = false;
}
}
else if (node.Parent.IsKind(SyntaxKind.SimpleAssignmentExpression))
{
rewrite = false;
}
else if (node.Parent.IsKind(SyntaxKind.InvocationExpression))
{
rewrite = true;
}
return SyntaxFactory.MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression,
SyntaxFactory.IdentifierName("@this"),
node
);
if (rewrite)
{
return SyntaxFactory.MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression,
SyntaxFactory.IdentifierName("@this"),
node
);
}
}
else if (symbolInfo.Symbol.Kind is SymbolKind.NamedType && node.Parent?.Kind() is not SyntaxKind.QualifiedName)
{