diff --git a/src/ObservableCollections.R3/ObservableCollectionR3Extensions.cs b/src/ObservableCollections.R3/ObservableCollectionR3Extensions.cs index 67d5da7..c62a02e 100644 --- a/src/ObservableCollections.R3/ObservableCollectionR3Extensions.cs +++ b/src/ObservableCollections.R3/ObservableCollectionR3Extensions.cs @@ -71,7 +71,7 @@ public static class ObservableCollectionR3Extensions return new ObservableCollectionReverse(source, cancellationToken); } - public static Observable<(int Index, int Count, IComparer Comparer)> ObserveSort(this IObservableCollection source, CancellationToken cancellationToken = default) + public static Observable<(int Index, int Count, IComparer? Comparer)> ObserveSort(this IObservableCollection source, CancellationToken cancellationToken = default) { return new ObservableCollectionSort(source, cancellationToken); } @@ -290,18 +290,18 @@ sealed class ObservableCollectionReverse(IObservableCollection collection, } } -sealed class ObservableCollectionSort(IObservableCollection collection, CancellationToken cancellationToken) : Observable<(int Index, int Count, IComparer Comparer)> +sealed class ObservableCollectionSort(IObservableCollection collection, CancellationToken cancellationToken) : Observable<(int Index, int Count, IComparer? Comparer)> { - protected override IDisposable SubscribeCore(Observer<(int Index, int Count, IComparer Comparer)> observer) + protected override IDisposable SubscribeCore(Observer<(int Index, int Count, IComparer? Comparer)> observer) { return new _ObservableCollectionSort(collection, observer, cancellationToken); } sealed class _ObservableCollectionSort( IObservableCollection collection, - Observer<(int Index, int Count, IComparer Comparer)> observer, + Observer<(int Index, int Count, IComparer? Comparer)> observer, CancellationToken cancellationToken) - : ObservableCollectionObserverBase Comparer)>(collection, observer, cancellationToken) + : ObservableCollectionObserverBase? Comparer)>(collection, observer, cancellationToken) { protected override void Handler(in NotifyCollectionChangedEventArgs eventArgs) { diff --git a/src/ObservableCollections/NotifyCollectionChangedEventArgs.cs b/src/ObservableCollections/NotifyCollectionChangedEventArgs.cs index 790c606..22c149a 100644 --- a/src/ObservableCollections/NotifyCollectionChangedEventArgs.cs +++ b/src/ObservableCollections/NotifyCollectionChangedEventArgs.cs @@ -25,9 +25,9 @@ namespace ObservableCollections Comparer = comparer ?? NullComparerSentinel.Instance; } - public (int Index, int Count, IComparer Comparer) AsTuple() + public (int Index, int Count, IComparer? Comparer) AsTuple() { - return (Index, Count, Comparer!); + return (Index, Count, Comparer); } public static SortOperation CreateReverse(int index, int count)