Update generated files

Author: ProphetLamb

sample/ImmutableEditableObjectAdapter.Samples/GeneratedFiles/ImmutableEditableObjectAdapter/ImmutableEditableObjectAdapter.ImmutableEditableObjectAdapterGenerator/EditableObjectAdapterDeclaration.g.cs

@@ -5,22 +5,21 @@ namespace System.ComponentModel
     using global::System.Runtime.CompilerServices;
 
     /// <summary>
-    /// Provides the old, and new value of the <see cref="EditedEventHandler{TContract}"/>.
+    /// Provides the old, and new value of the <see cref="EditedEventHandler{TContract}"/>, and indicates whether the value has changed.
     /// </summary>
     /// <typeparam name="TContract">The type of the contract <c>record</c>.</typeparam>
     public sealed class EditedEventArgs<TContract> : EventArgs
     {
-        public EditedEventArgs(
-            TContract oldValue,
-            TContract newValue
-        )
+        public EditedEventArgs(TContract oldValue, TContract newValue, bool cancelledOrUnchanged)
         {
             OldValue = oldValue;
             NewValue = newValue;
+            CancelledOrUnchanged = cancelledOrUnchanged;
         }
 
         public TContract OldValue { get; }
         public TContract NewValue { get; }
+        public bool CancelledOrUnchanged { get; }
     }
 
     /// <summary>
@@ -30,29 +29,74 @@ TContract newValue
     public delegate void EditedEventHandler<TContract>(
         ImmutableEditableObjectAdapter<TContract> sender,
         EditedEventArgs<TContract> args
-    ) where TContract : notnull;
+    )
+        where TContract : notnull;
+
+    /// <summary>
+    /// Non-generic interface implemented by <see cref="ImmutableEditableObjectAdapter{TContract}"/>.
+    /// </summary>
+    public interface IImmutableEditableObjectAdapter : IEditableObject, INotifyPropertyChanged, INotifyPropertyChanging
+    {
+        /// <summary>
+        /// Occurs before <see cref="IEditableObject.EndEdit"/> replaces the immutable state <c>record</c>, or <see cref="IEditableObject.CancelEdit"/> discards changes.
+        /// </summary>
+        event EventHandler? Edited;
+    }
 
     /// <summary>
     /// Derive a <c>sealed partial class</c> to generate a <see cref="IEditableObject"/> from a immutable state <c>record</c> type.
     /// <br/>
     /// Update the immutable state when the <see cref="Edited"/> event indicates the state is replaced.
     /// </summary>
     /// <typeparam name="TContract">The type of the contract <c>record</c>.</typeparam>
-    public abstract class ImmutableEditableObjectAdapter<TContract>
-        : IEditableObject, INotifyPropertyChanged, INotifyPropertyChanging
+    public abstract class ImmutableEditableObjectAdapter<TContract> : IImmutableEditableObjectAdapter
         where TContract : notnull
     {
+        private ConditionalWeakTable<Delegate, Delegate>? _editedByGenericEdited;
+
         /// <inheritdoc />
         public event PropertyChangedEventHandler? PropertyChanged;
 
         /// <inheritdoc />
         public event PropertyChangingEventHandler? PropertyChanging;
 
         /// <summary>
-        /// Occurs before <see cref="EndEdit"/> replaces the immutable state <c>record</c>.
+        /// Occurs before <see cref="EndEdit"/> replaces the immutable state <c>record</c>, or <see cref="CancelEdit"/> discards changes.
         /// </summary>
         public event EditedEventHandler<TContract>? Edited;
 
+        /// <inheritdoc />
+        event EventHandler? IImmutableEditableObjectAdapter.Edited
+        {
+            add
+            {
+                if (value is null)
+                {
+                    return;
+                }
+
+                _editedByGenericEdited ??= new ConditionalWeakTable<Delegate, Delegate>();
+                if (!_editedByGenericEdited.TryGetValue(value, out var edited))
+                {
+                    edited = (EditedEventHandler<TContract>)value.Invoke;
+                    _editedByGenericEdited.Add(value, edited);
+                }
+
+                Edited += (EditedEventHandler<TContract>)edited;
+            }
+            remove
+            {
+                if (value is not null
+                    && _editedByGenericEdited is not null
+                    && _editedByGenericEdited.TryGetValue(value, out var edited)
+                    && _editedByGenericEdited.Remove(value)
+                )
+                {
+                    Edited -= (EditedEventHandler<TContract>)edited;
+                }
+            }
+        }
+
         /// <inheritdoc />
         public abstract void BeginEdit();
 
@@ -63,12 +107,12 @@ public abstract class ImmutableEditableObjectAdapter<TContract>
         public abstract void EndEdit();
 
         /// <summary>
-        /// Enumerate names of all changed properties during edit, and <see cref="Edited"/>.
+        /// Enumerate names of all changed properties during edit.
         /// </summary>
         public abstract IEnumerable<string> ChangedProperties();
 
         /// <summary>
-        /// Indicates whether the property with the name name has changed during edit, and <see cref="Edited"/>.
+        /// Indicates whether the property with the name name has changed during edit.
         /// </summary>
         public abstract bool IsPropertyChanged(string propertyName);
 
@@ -82,14 +126,16 @@ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        protected virtual void OnEdited(TContract oldValue, TContract newValue)
+        protected virtual void OnEdited(TContract oldValue, TContract newValue, bool cancelledOrUnchanged)
         {
-            Edited?.Invoke(this, new EditedEventArgs<TContract>(oldValue, newValue));
+            EditedEventArgs<TContract> args = new EditedEventArgs<TContract>(oldValue, newValue, cancelledOrUnchanged);
+            Edited?.Invoke(this, args);
         }
 
         protected bool SetField<T>(ref T field, T value, [CallerMemberName] string? propertyName = null)
         {
-            if (EqualityComparer<T>.Default.Equals(field, value)) return false;
+            if (EqualityComparer<T>.Default.Equals(field, value))
+                return false;
             OnPropertyChanging(propertyName);
             field = value;
             OnPropertyChanged(propertyName);

sample/ImmutableEditableObjectAdapter.Samples/GeneratedFiles/ImmutableEditableObjectAdapter/ImmutableEditableObjectAdapter.ImmutableEditableObjectAdapterGenerator/EditablePerson.g.cs

@@ -203,6 +203,35 @@ public override void CancelEdit()
     {
         ThrowIfNotEditing();
         SetEditing(false);
+        OnEdited(Unedited, Unedited, true);
+        DiscardChanges();
+    }
+
+    public override void EndEdit()
+    {
+        ThrowIfNotEditing();
+        SetEditing(false);
+        global::Person unedited = _unedited;
+        bool changed = ((_changedFlags1 | 0ul) != 0ul);
+        if (!changed)
+        {
+            OnEdited(unedited, unedited, true);
+            return;
+        }
+
+        global::Person edited = unedited with {
+            Name = NamePropertyChanged ? _changedName : Unedited.Name,
+            FavouriteColor = FavouriteColorPropertyChanged ? _changedFavouriteColor : Unedited.FavouriteColor,
+            BirthDay = BirthDayPropertyChanged ? _changedBirthDay : Unedited.BirthDay,
+            DeceasedAt = DeceasedAtPropertyChanged ? _changedDeceasedAt : Unedited.DeceasedAt,
+        };
+        OnEdited(unedited, edited, false);
+        DiscardChanges();
+        SetField(ref _unedited, edited, nameof(Unedited));
+    }
+
+    private void DiscardChanges()
+    {
         bool isNameChanged = NamePropertyChanged;
         NamePropertyChanged = false;
         if (isNameChanged) OnPropertyChanging(nameof(Name));
@@ -225,21 +254,6 @@ public override void CancelEdit()
         if (isDeceasedAtChanged) OnPropertyChanged(nameof(DeceasedAt));
     }
 
-    public override void EndEdit()
-    {
-        ThrowIfNotEditing();
-        global::Person unedited = _unedited;
-        global::Person edited = unedited with {
-            Name = NamePropertyChanged ? _changedName : Unedited.Name,
-            FavouriteColor = FavouriteColorPropertyChanged ? _changedFavouriteColor : Unedited.FavouriteColor,
-            BirthDay = BirthDayPropertyChanged ? _changedBirthDay : Unedited.BirthDay,
-            DeceasedAt = DeceasedAtPropertyChanged ? _changedDeceasedAt : Unedited.DeceasedAt,
-        };
-        OnEdited(unedited, edited);
-        CancelEdit();
-        SetField(ref _unedited, edited, nameof(Unedited));
-    }
-
     public override IEnumerable<string> ChangedProperties()
     {
         if (NamePropertyChanged)