zoriya/EntityFrameworkCore.Projectables
1
0
Fork 0
mirror of https://github.com/zoriya/EntityFrameworkCore.Projectables.git synced 2026-05-18 17:26:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added fix for inherited members

Browse Source
This commit is contained in:
Koen Bekkenutte
2021-12-12 19:56:07 +08:00
parent ec2fb93140
commit f73cbc7ebb
3 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/EntityFrameworkCore.Projectables.Generator/ExpressionSyntaxRewriter.cs
+6 -2
View File
@@ -98,7 +98,7 @@ namespace EntityFrameworkCore.Projectables.Generator
{
var symbolInfo = _semanticModel.GetSymbolInfo(node);
if (symbolInfo.Symbol is not null && SymbolEqualityComparer.Default.Equals(symbolInfo.Symbol.ContainingType, _targetTypeSymbol))
if (symbolInfo.Symbol is not null)
{
var scopedNode = node.ChildNodes().FirstOrDefault();
if (scopedNode is ThisExpressionSyntax)
@@ -127,7 +127,7 @@ 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))
else if (symbolInfo.Symbol.Kind is SymbolKind.Property or SymbolKind.Method or SymbolKind.Field /*&& SymbolEqualityComparer.Default.Equals(symbolInfo.Symbol.ContainingType, _targetTypeSymbol)*/)
{
bool rewrite = true;
@@ -138,6 +138,10 @@ namespace EntityFrameworkCore.Projectables.Generator
{
rewrite = false;
}
if (targetSymbolInfo.Symbol?.ContainingType is not null && !_context.Compilation.HasImplicitConversion(targetSymbolInfo.Symbol.ContainingType, _targetTypeSymbol))
{
rewrite = false;
}
}
else if (node.Parent.IsKind(SyntaxKind.SimpleAssignmentExpression))
{
tests/EntityFrameworkCore.Projectables.Generator.Tests/EntityFrameworkCore.Projectables.Generator.Tests.csproj
-5
View File
@@ -23,11 +23,6 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<None Remove="**\*.verified.txt" />
<None Remove="**\*.received.txt" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables.Generator\EntityFrameworkCore.Projectables.Generator.csproj" />
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables\EntityFrameworkCore.Projectables.csproj" />
tests/EntityFrameworkCore.Projectables.Generator.Tests/ProjectionExpressionGeneratorTests.InheritedMembers.received.txt
-18
View File
@@ -1,18 +0,0 @@
using System;
using System.Linq;
using System.Collections.Generic;
using EntityFrameworkCore.Projectables;
using Foo;
namespace EntityFrameworkCore.Projectables.Generated
#nullable disable
{
public static class Foo_Bar_ProjectedId
{
public static System.Linq.Expressions.Expression<System.Func<global::Foo.Bar, int>> Expression()
{
return (global::Foo.Bar @this) =>
Id;
}
}
}