Merge branch 'master' into incr-source-gen

This commit is contained in:
Koen
2022-01-08 19:20:00 +08:00
committed by GitHub
3 changed files with 56 additions and 3 deletions
@@ -129,7 +129,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)
{
bool rewrite = true;
@@ -140,9 +140,13 @@ namespace EntityFrameworkCore.Projectables.Generator
{
rewrite = false;
}
if (targetSymbolInfo.Symbol?.ContainingType is not null && !_compilation.HasImplicitConversion(targetSymbolInfo.Symbol.ContainingType, _targetTypeSymbol))
if (targetSymbolInfo.Symbol?.ContainingType is not null)
{
rewrite = false;
if (!_compilation.HasImplicitConversion(targetSymbolInfo.Symbol.ContainingType, _targetTypeSymbol) ||
!SymbolEqualityComparer.Default.Equals(symbolInfo.Symbol.ContainingType, _targetTypeSymbol))
{
rewrite = false;
}
}
}
else if (node.Parent.IsKind(SyntaxKind.SimpleAssignmentExpression))