Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public ExpressionSyntaxRewriter(INamedTypeSymbol targetTypeSymbol, SemanticModel
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)
{
bool rewrite = true;

Expand All @@ -138,9 +138,13 @@ public ExpressionSyntaxRewriter(INamedTypeSymbol targetTypeSymbol, SemanticModel
{
rewrite = false;
}
if (targetSymbolInfo.Symbol?.ContainingType is not null && !_context.Compilation.HasImplicitConversion(targetSymbolInfo.Symbol.ContainingType, _targetTypeSymbol))
if (targetSymbolInfo.Symbol?.ContainingType is not null)
{
rewrite = false;
if (!_context.Compilation.HasImplicitConversion(targetSymbolInfo.Symbol.ContainingType, _targetTypeSymbol) ||
!SymbolEqualityComparer.Default.Equals(symbolInfo.Symbol.ContainingType, _targetTypeSymbol))
{
rewrite = false;
}
}
}
else if (node.Parent.IsKind(SyntaxKind.SimpleAssignmentExpression))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
using System;
using System.Linq;
using System.Collections.Generic;
using EntityFrameworkCore.Projectables;
using Foos;

namespace EntityFrameworkCore.Projectables.Generated
#nullable disable
{
public static class Foos_Bar_FooId
{
public static System.Linq.Expressions.Expression<System.Func<global::Foos.Bar, int>> Expression()
{
return (global::Foos.Bar @this) =>
@this.Foo.Id;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,37 @@ public class Bar : Foo {
return Verifier.Verify(result.GeneratedTrees[0].ToString());
}

[Fact]
public Task RelationalProperty()
{
var compilation = CreateCompilation(@"
using System;
using System.Linq;
using System.Collections.Generic;
using EntityFrameworkCore.Projectables;

namespace Foos {
public class Foo {
public int Id { get; set; }
}

public class Bar {
public Foo Foo { get; set; }

[Projectable]
public int FooId => Foo.Id;
}
}
");

var result = RunGenerator(compilation);

Assert.Empty(result.Diagnostics);
Assert.Single(result.GeneratedTrees);

return Verifier.Verify(result.GeneratedTrees[0].ToString());
}

#region Helpers

Compilation CreateCompilation(string source, bool expectedToCompile = true)
Expand Down