Skip to content

Hierarchy implementation and fixes #215

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

Open
Xriuk wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Hierarchy implementation and fixes #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8152ab4
Hierarchy implementation
Xriuk Jun 15, 2026
3b5a47a
Rewritten "base" translation + fixed @this translation in switch expr…
Xriuk Jun 17, 2026
08e4ce6
Cleanup
Xriuk Jun 17, 2026
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
4 changes: 2 additions & 2 deletions src/EntityFrameworkCore.Projectables.Generator/Infrastructure/Diagnostics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ static internal class Diagnostics

public readonly static DiagnosticDescriptor RequiresBodyDefinition = new DiagnosticDescriptor(
id: "EFP0006",
title: "Method or property should expose a body definition",
messageFormat: "Method or property '{0}' should expose a body definition (e.g. an expression-bodied member or a block-bodied method) to be used as the source for the generated expression tree.",
title: "Method or property should expose a body definition if not overwritten in classes derived from the declaring class",
messageFormat: "Method or property '{0}' should expose a body definition (e.g. an expression-bodied member or a block-bodied method) to be used as the source for the generated expression tree if not overwritten in at least one class derived from the class where the method or property is declared.",
category: "Design",
DiagnosticSeverity.Error,
isEnabledByDefault: true);
Expand Down
175 changes: 113 additions & 62 deletions ...meworkCore.Projectables.Generator/Interpretation/ProjectableInterpreter.BodyProcessors.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,23 @@ static internal partial class ProjectableInterpreter
/// Returns <c>false</c> and reports diagnostics on failure.
/// </summary>
private static bool TryApplyMethodBody(
MemberDeclarationSyntax originalMemberDeclarationSyntax,
MethodDeclarationSyntax methodDeclarationSyntax,
SemanticModel semanticModel,
bool allowBlockBody,
ISymbol memberSymbol,
ExpressionSyntaxRewriter expressionSyntaxRewriter,
DeclarationSyntaxRewriter declarationSyntaxRewriter,
SourceProductionContext context,
Compilation? compilation,
ProjectableDescriptor descriptor)
{
ExpressionSyntax? bodyExpression = null;
var isExpressionBodied = false;

var derivedTypes = GetDerivedTypes(semanticModel.GetDeclaredSymbol(originalMemberDeclarationSyntax), compilation);
var isHierarchy = derivedTypes?.Count > 0;

if (methodDeclarationSyntax.ExpressionBody is not null)
{
bodyExpression = methodDeclarationSyntax.ExpressionBody.Expression;
Expand All @@ -48,7 +54,7 @@ private static bool TryApplyMethodBody(
return false; // diagnostics already reported by BlockStatementConverter
}
}
else
else if (!isHierarchy)
{
return ReportRequiresBodyAndFail(context, methodDeclarationSyntax, memberSymbol.Name);
}
Expand All @@ -57,7 +63,7 @@ private static bool TryApplyMethodBody(
descriptor.ReturnTypeName = returnType.ToString();

// Only rewrite expression-bodied methods; block-bodied methods are already rewritten
descriptor.ExpressionBody = isExpressionBodied
descriptor.ExpressionBody = isExpressionBodied && bodyExpression != null
? (ExpressionSyntax)expressionSyntaxRewriter.Visit(bodyExpression)
: bodyExpression;

Expand All @@ -73,6 +79,13 @@ private static bool TryApplyMethodBody(
ApplyExtensionBlockTypeParameters(memberSymbol, descriptor);
}

// If we are rewriting a hierarchy method we need to invoke the derived types' overrides
if(isHierarchy)
{
descriptor.HierarchyOriginalExpressionBody = descriptor.ExpressionBody;
descriptor.ExpressionBody = new HierarchyMembersConverter().DuplicateMethodExpression(derivedTypes!, descriptor);
}

return true;
}

Expand All @@ -92,14 +105,18 @@ private static bool TryApplyExpressionPropertyBody(
ExpressionSyntaxRewriter expressionSyntaxRewriter,
DeclarationSyntaxRewriter declarationSyntaxRewriter,
SourceProductionContext context,
Compilation? compilation,
ProjectableDescriptor descriptor)
{
var derivedTypes = GetDerivedTypes(semanticModel.GetDeclaredSymbol(originalMethodDecl), compilation);
var isHierarchy = derivedTypes?.Count > 0;

var rawExpr = TryGetPropertyGetterExpression(exprPropDecl);
var (innerBody, lambdaParamNames) = rawExpr is not null
? TryExtractLambdaBodyAndParams(rawExpr, semanticModel, member.SyntaxTree)
: (null, []);

if (innerBody is null)
if (innerBody is null && !isHierarchy)
{
return ReportRequiresBodyAndFail(context, exprPropDecl, memberSymbol.Name);
}
Expand All @@ -112,77 +129,80 @@ private static bool TryApplyExpressionPropertyBody(
// For cross-tree expression properties the rewriter's SemanticModel cannot resolve
// nodes from the other file — skip rewriting in that case (simple lambda bodies need
// no rewrites; advanced features like null-conditional rewriting are unsupported cross-file).
var visitedBody = exprPropDecl.SyntaxTree == member.SyntaxTree
var visitedBody = exprPropDecl.SyntaxTree == member.SyntaxTree && innerBody != null
? (ExpressionSyntax)expressionSyntaxRewriter.Visit(innerBody)
: innerBody;

// For instance methods and C#14 extension members, BuildBaseDescriptor adds an
// implicit @this receiver parameter. If the expression property lambda uses a
// different parameter name (e.g. c => c.Value > 0), rename it so the generated
// code references @this instead of an undefined identifier.
if (visitedBody != null)
{
// For instance methods and C#14 extension members, BuildBaseDescriptor adds an
// implicit @this receiver parameter. If the expression property lambda uses a
// different parameter name (e.g. c => c.Value > 0), rename it so the generated
// code references @this instead of an undefined identifier.
#if ROSLYN_5_0_OR_LATER
var isExtensionMember = memberSymbol.ContainingType is { IsExtension: true };
var isExtensionMember = memberSymbol.ContainingType is { IsExtension: true };
#else
var isExtensionMember = false;
var isExtensionMember = false;
#endif
var hasImplicitReceiver = isExtensionMember
|| !originalMethodDecl.Modifiers.Any(SyntaxKind.StaticKeyword);
var hasImplicitReceiver = isExtensionMember
|| !originalMethodDecl.Modifiers.Any(SyntaxKind.StaticKeyword);

// Collect (lambdaParamName → methodParamName) rename pairs to apply in a
// single multi-variable pass, avoiding cascading renames when names overlap.
var renames = new List<(string From, string To)>();
// Collect (lambdaParamName → methodParamName) rename pairs to apply in a
// single multi-variable pass, avoiding cascading renames when names overlap.
var renames = new List<(string From, string To)>();

var lambdaOffset = 0;
if (hasImplicitReceiver)
{
if (lambdaParamNames.Count > 0 && lambdaParamNames[0] != "@this")
var lambdaOffset = 0;
if (hasImplicitReceiver)
{
renames.Add((lambdaParamNames[0], "@this"));
}

lambdaOffset = 1;
}
if (lambdaParamNames.Count > 0 && lambdaParamNames[0] != "@this")
{
renames.Add((lambdaParamNames[0], "@this"));
}

// Rename each explicit method parameter from its lambda counterpart name.
var methodParams = originalMethodDecl.ParameterList.Parameters;
for (var i = 0; i < methodParams.Count; i++)
{
var lambdaIdx = lambdaOffset + i;
if (lambdaIdx >= lambdaParamNames.Count)
{
break;
lambdaOffset = 1;
}

var lambdaName = lambdaParamNames[lambdaIdx];
var methodName = methodParams[i].Identifier.ValueText;
if (lambdaName != methodName)
// Rename each explicit method parameter from its lambda counterpart name.
var methodParams = originalMethodDecl.ParameterList.Parameters;
for (var i = 0; i < methodParams.Count; i++)
{
renames.Add((lambdaName, methodName));
}
}
var lambdaIdx = lambdaOffset + i;
if (lambdaIdx >= lambdaParamNames.Count)
{
break;
}

// Apply all renames. To avoid cascading substitutions when names overlap
// (e.g. swapped parameter names), use a unique sentinel prefix for each
// intermediate name, then replace sentinels with the final names.
if (renames.Count > 0)
{
// Phase 1: rename each source name to a collision-free sentinel.
var sentinels = new List<(string Sentinel, string To)>(renames.Count);
for (var i = 0; i < renames.Count; i++)
{
var sentinel = $"__rename_sentinel_{i}__";
visitedBody = (ExpressionSyntax)new VariableReplacementRewriter(
renames[i].From,
SyntaxFactory.IdentifierName(sentinel)).Visit(visitedBody);
sentinels.Add((sentinel, renames[i].To));
var lambdaName = lambdaParamNames[lambdaIdx];
var methodName = methodParams[i].Identifier.ValueText;
if (lambdaName != methodName)
{
renames.Add((lambdaName, methodName));
}
}

// Phase 2: replace each sentinel with the final target name.
foreach (var (sentinel, to) in sentinels)
// Apply all renames. To avoid cascading substitutions when names overlap
// (e.g. swapped parameter names), use a unique sentinel prefix for each
// intermediate name, then replace sentinels with the final names.
if (renames.Count > 0)
{
visitedBody = (ExpressionSyntax)new VariableReplacementRewriter(
sentinel,
SyntaxFactory.IdentifierName(to)).Visit(visitedBody);
// Phase 1: rename each source name to a collision-free sentinel.
var sentinels = new List<(string Sentinel, string To)>(renames.Count);
for (var i = 0; i < renames.Count; i++)
{
var sentinel = $"__rename_sentinel_{i}__";
visitedBody = (ExpressionSyntax)new VariableReplacementRewriter(
renames[i].From,
SyntaxFactory.IdentifierName(sentinel)).Visit(visitedBody);
sentinels.Add((sentinel, renames[i].To));
}

// Phase 2: replace each sentinel with the final target name.
foreach (var (sentinel, to) in sentinels)
{
visitedBody = (ExpressionSyntax)new VariableReplacementRewriter(
sentinel,
SyntaxFactory.IdentifierName(to)).Visit(visitedBody);
}
}
}

Expand All @@ -191,6 +211,13 @@ private static bool TryApplyExpressionPropertyBody(
ApplyParameterList(originalMethodDecl.ParameterList, declarationSyntaxRewriter, descriptor);
ApplyTypeParameters(originalMethodDecl, declarationSyntaxRewriter, descriptor);

// If we are rewriting a hierarchy method we need to invoke the derived types' overrides
if (isHierarchy)
{
descriptor.HierarchyOriginalExpressionBody = descriptor.ExpressionBody;
descriptor.ExpressionBody = new HierarchyMembersConverter().DuplicateMethodExpression(derivedTypes!, descriptor);
}

return true;
}

Expand All @@ -211,14 +238,18 @@ private static bool TryApplyExpressionPropertyBodyForProperty(
ExpressionSyntaxRewriter expressionSyntaxRewriter,
DeclarationSyntaxRewriter declarationSyntaxRewriter,
SourceProductionContext context,
Compilation? compilation,
ProjectableDescriptor descriptor)
{
var derivedTypes = GetDerivedTypes(semanticModel.GetDeclaredSymbol(originalPropertyDecl), compilation);
var isHierarchy = derivedTypes?.Count > 0;

var rawExpr = TryGetPropertyGetterExpression(exprPropDecl);
var (innerBody, firstParamName) = rawExpr is not null
? TryExtractLambdaBodyAndFirstParam(rawExpr, semanticModel, member.SyntaxTree)
: (null, null);

if (innerBody is null)
if (innerBody is null && !isHierarchy)
{
return ReportRequiresBodyAndFail(context, exprPropDecl, memberSymbol.Name);
}
Expand All @@ -229,10 +260,10 @@ private static bool TryApplyExpressionPropertyBodyForProperty(
// uses the semantic model which requires the original (pre-rename) syntax nodes.
// For cross-tree expression properties the rewriter's SemanticModel cannot resolve
// nodes from the other file — skip rewriting in that case.
var visitedBody = exprPropDecl.SyntaxTree == member.SyntaxTree
var visitedBody = exprPropDecl.SyntaxTree == member.SyntaxTree && innerBody != null
? (ExpressionSyntax)expressionSyntaxRewriter.Visit(innerBody)
: innerBody;
if (firstParamName is not null && firstParamName != "@this")
if (visitedBody != null && firstParamName != null && firstParamName != "@this")
{
visitedBody = (ExpressionSyntax)new VariableReplacementRewriter(
firstParamName,
Expand All @@ -243,6 +274,13 @@ private static bool TryApplyExpressionPropertyBodyForProperty(
descriptor.ReturnTypeName = returnType.ToString();
descriptor.ExpressionBody = visitedBody;

// If we are rewriting a hierarchy method we need to invoke the derived types' overrides
if (isHierarchy)
{
descriptor.HierarchyOriginalExpressionBody = descriptor.ExpressionBody;
descriptor.ExpressionBody = new HierarchyMembersConverter().DuplicatePropertyExpression(derivedTypes!, descriptor);
}

return true;
}

Expand All @@ -251,14 +289,20 @@ private static bool TryApplyExpressionPropertyBodyForProperty(
/// Returns <c>false</c> and reports diagnostics on failure.
/// </summary>
private static bool TryApplyPropertyBody(
MemberDeclarationSyntax originalMemberDeclarationSyntax,
PropertyDeclarationSyntax propertyDeclarationSyntax,
SemanticModel semanticModel,
bool allowBlockBody,
ISymbol memberSymbol,
ExpressionSyntaxRewriter expressionSyntaxRewriter,
DeclarationSyntaxRewriter declarationSyntaxRewriter,
SourceProductionContext context,
Compilation? compilation,
ProjectableDescriptor descriptor)
{
var derivedTypes = GetDerivedTypes(semanticModel.GetDeclaredSymbol(originalMemberDeclarationSyntax), compilation);
var isHierarchy = derivedTypes?.Count > 0;

ExpressionSyntax? bodyExpression = null;
var isBlockBodiedGetter = false;

Expand Down Expand Up @@ -299,7 +343,7 @@ private static bool TryApplyPropertyBody(
}
}

if (bodyExpression is null)
if (bodyExpression is null && !isHierarchy)
{
return ReportRequiresBodyAndFail(context, propertyDeclarationSyntax, memberSymbol.Name);
}
Expand All @@ -308,10 +352,17 @@ private static bool TryApplyPropertyBody(
descriptor.ReturnTypeName = returnType.ToString();

// Only rewrite expression-bodied properties; block-bodied getters are already rewritten
descriptor.ExpressionBody = isBlockBodiedGetter
descriptor.ExpressionBody = isBlockBodiedGetter || bodyExpression == null
? bodyExpression
: (ExpressionSyntax)expressionSyntaxRewriter.Visit(bodyExpression);

// If we are rewriting a hierarchy method we need to invoke the derived types' overrides
if (isHierarchy)
{
descriptor.HierarchyOriginalExpressionBody = descriptor.ExpressionBody;
descriptor.ExpressionBody = new HierarchyMembersConverter().DuplicatePropertyExpression(derivedTypes!, descriptor);
}

return true;
}

Expand Down
Loading
Loading