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

Support for const and static in projectables

Browse Source
This commit is contained in:
Koen Bekkenutte
2022-04-20 23:40:20 +08:00
parent 10665bc348
commit a3ee321936
16 changed files with 375 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/EntityFrameworkCore.Projectables.Generator/Diagnostics.cs
+2 -2
View File
@@ -9,7 +9,7 @@ namespace EntityFrameworkCore.Projectables.Generator
{
public static class Diagnostics
{
public static readonly DiagnosticDescriptor RequiresExpressionBodyDefinition = new(
public static readonly DiagnosticDescriptor RequiresExpressionBodyDefinition = new DiagnosticDescriptor(
id: "EFP0001",
title: "Method or property should expose an expression body definition",
messageFormat: "Method or property '{0}' should expose an expression body definition",
@@ -17,7 +17,7 @@ namespace EntityFrameworkCore.Projectables.Generator
DiagnosticSeverity.Error,
isEnabledByDefault: true);
public static readonly DiagnosticDescriptor NullConditionalRewriteUnsupported = new(
public static readonly DiagnosticDescriptor NullConditionalRewriteUnsupported = new DiagnosticDescriptor(
id: "EFP0002",
title: "Method or property is not configured to support null-conditional expressions",
messageFormat: "'{0}' has a null-conditional expression exposed but is not configured to rewrite this (Consider configuring a strategy using the NullConditionalRewriteSupport property on the Projectable attribute)",
src/EntityFrameworkCore.Projectables.Generator/ExpressionSyntaxRewriter.cs
+14 -7
View File
@@ -122,15 +122,17 @@ namespace EntityFrameworkCore.Projectables.Generator
public override SyntaxNode? VisitIdentifierName(IdentifierNameSyntax node)
{
var symbolInfo = _semanticModel.GetSymbolInfo(node);
var symbol = _semanticModel.GetSymbolInfo(node).Symbol;
if (symbolInfo.Symbol is not null)
if (symbol is not null)
{
if (symbolInfo.Symbol is IMethodSymbol methodSymbol && methodSymbol.IsExtensionMethod)
if (symbol is IMethodSymbol methodSymbol && methodSymbol.IsExtensionMethod)
{
// Ignore extension methods
}
else if (symbolInfo.Symbol.Kind is SymbolKind.Property or SymbolKind.Method or SymbolKind.Field)
else if (symbol.Kind is SymbolKind.Property or SymbolKind.Method or SymbolKind.Field)
{
// We may need to rewrite this expression such that it refers to our @this argument
bool rewrite = true;
if (node.Parent is MemberAccessExpressionSyntax parentMemberAccessNode)
@@ -147,7 +149,7 @@ namespace EntityFrameworkCore.Projectables.Generator
else if (targetSymbolInfo.Symbol?.ContainingType is not null)
{
if (!_compilation.HasImplicitConversion(targetSymbolInfo.Symbol.ContainingType, _targetTypeSymbol) ||
!SymbolEqualityComparer.Default.Equals(symbolInfo.Symbol.ContainingType, _targetTypeSymbol))
!SymbolEqualityComparer.Default.Equals(symbol.ContainingType, _targetTypeSymbol))
{
rewrite = false;
}
@@ -164,13 +166,18 @@ namespace EntityFrameworkCore.Projectables.Generator
if (rewrite)
{
var expressionSyntax = symbol.IsStatic
? SyntaxFactory.ParseTypeName(_targetTypeSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat))
: SyntaxFactory.IdentifierName("@this");
return SyntaxFactory.MemberAccessExpression(SyntaxKind.SimpleMemberAccessExpression,
SyntaxFactory.IdentifierName("@this"),
expressionSyntax,
node
);
}
}
else if (symbolInfo.Symbol.Kind is SymbolKind.NamedType && node.Parent?.Kind() is not SyntaxKind.QualifiedName)
else if (symbol.Kind is SymbolKind.NamedType && node.Parent?.Kind() is not SyntaxKind.QualifiedName)
{
var typeInfo = _semanticModel.GetTypeInfo(node);