Refactor complex property change tracking (#35857)

Part of #31237

Author: AndriySvyryd

src/EFCore.Design/Query/Internal/LinqToCSharpSyntaxTranslator.cs

@@ -22,7 +22,7 @@ namespace Microsoft.EntityFrameworkCore.Query.Internal;
 ///     any release. You should only use it directly in your code with extreme caution and knowing that
 ///     doing so can result in application failures when updating to a new Entity Framework Core release.
 /// </summary>
-public class LinqToCSharpSyntaxTranslator : ExpressionVisitor
+public class LinqToCSharpSyntaxTranslator(SyntaxGenerator syntaxGenerator) : ExpressionVisitor
 {
     private sealed record StackFrame(
         Dictionary<ParameterExpression, string> Variables,
@@ -38,7 +38,7 @@ private readonly Stack<StackFrame> _stack
     private sealed record LiftedState
     {
         internal readonly List<StatementSyntax> Statements = [];
-        internal readonly Dictionary<ParameterExpression, string> Variables = new();
+        internal readonly Dictionary<ParameterExpression, string> Variables = [];
         internal readonly HashSet<string> VariableNames = [];
         internal readonly List<LocalDeclarationStatementSyntax> UnassignedVariableDeclarations = [];
 
@@ -65,25 +65,16 @@ internal LiftedState CreateChild()
 
     private readonly HashSet<ParameterExpression> _capturedVariables = [];
     private ISet<string> _collectedNamespaces = null!;
-    private readonly Dictionary<MethodBase, MethodDeclarationSyntax> _methodUnsafeAccessors = new();
-    private readonly Dictionary<(FieldInfo Field, bool ForWrite), MethodDeclarationSyntax> _fieldUnsafeAccessors = new();
+    private readonly Dictionary<MethodBase, MethodDeclarationSyntax> _methodUnsafeAccessors = [];
+    private readonly Dictionary<(FieldInfo Field, bool ForWrite), MethodDeclarationSyntax> _fieldUnsafeAccessors = [];
 
     private static MethodInfo? _mathPowMethod;
 
     private readonly SideEffectDetectionSyntaxWalker _sideEffectDetector = new();
     private readonly ConstantDetectionSyntaxWalker _constantDetector = new();
-    private readonly SyntaxGenerator _g;
+    private readonly SyntaxGenerator _g = syntaxGenerator;
     private readonly StringBuilder _stringBuilder = new();
 
-    /// <summary>
-    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-    ///     any release. You should only use it directly in your code with extreme caution and knowing that
-    ///     doing so can result in application failures when updating to a new Entity Framework Core release.
-    /// </summary>
-    public LinqToCSharpSyntaxTranslator(SyntaxGenerator syntaxGenerator)
-        => _g = syntaxGenerator;
-
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
@@ -422,14 +413,9 @@ Expression VisitAssignment(BinaryExpression assignment, SyntaxKind kind)
 
             // If the RHS was lifted out and the assignment lowering succeeded, Translate above returns the lowered assignment variable;
             // this would mean that we return a useless identity assignment (i = i). Instead, just return it.
-            if (translatedRight == translatedLeft)
-            {
-                Result = translatedRight;
-            }
-            else
-            {
-                Result = AssignmentExpression(kind, translatedLeft, translatedRight);
-            }
+            Result = translatedRight == translatedLeft
+                ? translatedRight
+                : (SyntaxNode)AssignmentExpression(kind, translatedLeft, translatedRight);
 
             return assignment;
         }
@@ -1474,7 +1460,7 @@ NameSyntax GenerateGenericType(Type type, List<TypeSyntax> genericArguments, int
             SimpleNameSyntax nameSyntax = genericPartIndex <= 0
                 ? IdentifierName(type.Name)
                 : GenericName(
-                    Identifier(type.Name.Substring(0, genericPartIndex)),
+                    Identifier(type.Name[..genericPartIndex]),
                     TypeArgumentList(SeparatedList(genericArguments.Skip(offset).Take(length - offset))));
             if (type.DeclaringType == null)
             {
@@ -1637,7 +1623,7 @@ when constantExpression.Type.Attributes.HasFlag(TypeAttributes.NestedPrivate)
                     { Expression: null } => Generate(member.Member.DeclaringType!),
 
                     // If the member is declared on an interface, add a cast up to it, to handle explicit interface implementation.
-                    _ when member.Member.DeclaringType is { IsInterface: true }
+                    _ when member.Member.DeclaringType is { IsInterface: true } && member.Expression.Type != member.Member.DeclaringType
                         => ParenthesizedExpression(
                             CastExpression(Generate(member.Member.DeclaringType), Translate<ExpressionSyntax>(member.Expression))),
 
@@ -2212,7 +2198,7 @@ SyntaxList<StatementSyntax> ProcessArmBody(Expression body)
                     var result = translatedBody switch
                     {
                         BlockSyntax block => SingletonList<StatementSyntax>(block.WithStatements(block.Statements.Add(BreakStatement()))),
-                        StatementSyntax s => List(new[] { s, BreakStatement() }),
+                        StatementSyntax s => List([s, BreakStatement()]),
                         ExpressionSyntax e => List(new StatementSyntax[] { ExpressionStatement(e), BreakStatement() }),
 
                         _ => throw new ArgumentOutOfRangeException()
@@ -2379,14 +2365,14 @@ protected override Expression VisitTry(TryExpression tryNode)
         var translatedBody = Translate(tryNode.Body) switch
         {
             BlockSyntax b => (IEnumerable<SyntaxNode>)b.Statements,
-            var n => new[] { n }
+            var n => [n]
         };
 
         var translatedFinally = Translate(tryNode.Finally) switch
         {
             BlockSyntax b => (IEnumerable<SyntaxNode>)b.Statements,
             null => null,
-            var n => new[] { n }
+            var n => [n]
         };
 
         switch (_context)

src/EFCore.Design/Scaffolding/Internal/CSharpRuntimeModelCodeGenerator.cs

@@ -1566,8 +1566,7 @@ private void
                 out var currentValueGetter,
                 out var preStoreGeneratedCurrentValueGetter,
                 out var originalValueGetter,
-                out var relationshipSnapshotGetter,
-                out var valueBufferGetter);
+                out var relationshipSnapshotGetter);
 
             mainBuilder
                 .Append(variableName).AppendLine(".SetAccessors(")
@@ -1594,14 +1593,6 @@ private void
                     _code.Expression(
                         relationshipSnapshotGetter, parameters.Namespaces, unsafeAccessors,
                         (IReadOnlyDictionary<object, string>)parameters.ScopeVariables, memberAccessReplacements), skipFinalNewline: true)
-                .AppendLine(",")
-                .AppendLines(
-                    valueBufferGetter == null
-                        ? "null"
-                        : _code.Expression(
-                            valueBufferGetter, parameters.Namespaces, unsafeAccessors,
-                            (IReadOnlyDictionary<object, string>)parameters.ScopeVariables, memberAccessReplacements),
-                    skipFinalNewline: true)
                 .AppendLine(");")
                 .DecrementIndent();
 

src/EFCore.InMemory/Metadata/Internal/CosmosAnnotationNames.cs renamed to src/EFCore.InMemory/Metadata/Internal/InMemoryAnnotationNames.cs

@@ -22,16 +22,6 @@ namespace Microsoft.EntityFrameworkCore.ChangeTracking;
 /// <typeparam name="TKey">The generic type of the key.</typeparam>
 public interface IDependentKeyValueFactory<TKey> : IDependentKeyValueFactory
 {
-    /// <summary>
-    ///     Attempts to create a key instance using foreign key values from the given <see cref="ValueBuffer" />.
-    /// </summary>
-    /// <param name="valueBuffer">The value buffer representing the entity instance.</param>
-    /// <param name="key">The key instance.</param>
-    /// <returns><see langword="true" /> if the key instance was created; <see langword="false" /> otherwise.</returns>
-    [ContractAnnotation("=>true, key:notnull; =>false, key:null")]
-    [Obsolete]
-    bool TryCreateFromBuffer(in ValueBuffer valueBuffer, [NotNullWhen(true)] out TKey? key);
-
     /// <summary>
     ///     Attempts to create a key instance using foreign key values from the given <see cref="IUpdateEntry" />.
     /// </summary>

src/EFCore/ChangeTracking/IDependentKeyValueFactory`.cs

@@ -26,14 +26,6 @@ public interface IPrincipalKeyValueFactory<TKey> : IPrincipalKeyValueFactory
     /// <returns>The key object, or null if any of the key values were null.</returns>
     object? CreateFromKeyValues(IReadOnlyList<object?> keyValues);
 
-    /// <summary>
-    ///     Creates a key object from key values obtained from their indexed position in the given <see cref="ValueBuffer" />.
-    /// </summary>
-    /// <param name="valueBuffer">The buffer containing key values.</param>
-    /// <returns>The key object, or null if any of the key values were null.</returns>
-    [Obsolete]
-    object? CreateFromBuffer(ValueBuffer valueBuffer);
-
     /// <summary>
     ///     Finds the first null in the given in-order array of key values and returns the associated <see cref="IProperty" />.
     /// </summary>