Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[API Implementation]: Add Order and OrderDescending to Enumerable and Queryable #70525

Merged
merged 19 commits into from
Jun 30, 2022
Merged

[API Implementation]: Add Order and OrderDescending to Enumerable and Queryable #70525

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
de029dd
Implement proposal for `System.Linq`
deeprobin Jun 9, 2022
23d2081
Implement proposal for `System.Linq.Queryable`
deeprobin Jun 9, 2022
ea53a6c
Add documentation
deeprobin Jun 9, 2022
2749e41
Merge branch 'main' into issue-67194
deeprobin Jun 13, 2022
b0fa072
Merge branch 'main' into issue-67194
deeprobin Jun 13, 2022
1025faf
Add more test cases
deeprobin Jun 13, 2022
16bfbf9
Apply suggestions
deeprobin Jun 13, 2022
6a21dbf
Remove unneccesary keyless stuff
deeprobin Jun 13, 2022
fbb3a74
Add more Queryable test cases
deeprobin Jun 14, 2022
879421b
Eliminate `keySelector` null-check in ctor
deeprobin Jun 14, 2022
7f2c3f1
Add null checks to `ThenBy`
deeprobin Jun 14, 2022
1382af8
Revert "Eliminate `keySelector` null-check in ctor"
deeprobin Jun 28, 2022
bd1659a
Add tests for CreateOrderedEnumerable
deeprobin Jun 28, 2022
885caa9
Merge branch 'main' into issue-67194
deeprobin Jun 28, 2022
45a3776
Apply suggestions
deeprobin Jun 29, 2022
94369ff
Fix null checks
deeprobin Jun 29, 2022
abddd4d
Fix null checks
deeprobin Jun 29, 2022
c0eec68
Update src/libraries/System.Linq/src/System/Linq/OrderBy.cs
eiriktsarpalis Jun 29, 2022
8b40b2f
Update src/libraries/System.Linq/src/System/Linq/OrderBy.cs
eiriktsarpalis Jun 30, 2022
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
70 changes: 6 additions & 64 deletions src/libraries/System.Linq/src/System/Linq/OrderBy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,10 @@ public static IOrderedEnumerable<T> Order<T>(this IEnumerable<T> source, ICompar
OrderBy(source, static element => element, comparer);

public static IOrderedEnumerable<TSource> OrderBy<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector)
{
if (keySelector is null)
{
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.keySelector);
}

return new OrderedEnumerable<TSource, TKey>(source, keySelector, null, false, null);
}
=> OrderBy(source, keySelector, null);
eiriktsarpalis marked this conversation as resolved.
Show resolved Hide resolved

public static IOrderedEnumerable<TSource> OrderBy<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, IComparer<TKey>? comparer)
{
if (keySelector is null)
{
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.keySelector);
}

return new OrderedEnumerable<TSource, TKey>(source, keySelector, comparer, false, null);
}
=> new OrderedEnumerable<TSource, TKey>(source, keySelector, comparer, false, null);

/// <summary>
/// Sorts the elements of a sequence in descending order.
Expand Down Expand Up @@ -108,60 +94,16 @@ public static IOrderedEnumerable<TSource> OrderByDescending<TSource, TKey>(this
new OrderedEnumerable<TSource, TKey>(source, keySelector, comparer, true, null);

public static IOrderedEnumerable<TSource> ThenBy<TSource, TKey>(this IOrderedEnumerable<TSource> source, Func<TSource, TKey> keySelector)
{
if (source == null)
deeprobin marked this conversation as resolved.
Show resolved Hide resolved
{
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.source);
}
if (keySelector is null)
{
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.keySelector);
}

return source.CreateOrderedEnumerable(keySelector, null, false);
}
=> source.CreateOrderedEnumerable(keySelector, null, false);

public static IOrderedEnumerable<TSource> ThenBy<TSource, TKey>(this IOrderedEnumerable<TSource> source, Func<TSource, TKey> keySelector, IComparer<TKey>? comparer)
{
if (source == null)
{
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.source);
}
if (keySelector is null)
{
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.keySelector);
}

return source.CreateOrderedEnumerable(keySelector, comparer, false);
}
=> source.CreateOrderedEnumerable(keySelector, comparer, false);

public static IOrderedEnumerable<TSource> ThenByDescending<TSource, TKey>(this IOrderedEnumerable<TSource> source, Func<TSource, TKey> keySelector)
{
if (source == null)
{
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.source);
}
if (keySelector is null)
{
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.keySelector);
}

return source.CreateOrderedEnumerable(keySelector, null, true);
}
=> source.CreateOrderedEnumerable(keySelector, null, true);

public static IOrderedEnumerable<TSource> ThenByDescending<TSource, TKey>(this IOrderedEnumerable<TSource> source, Func<TSource, TKey> keySelector, IComparer<TKey>? comparer)
{
if (source == null)
{
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.source);
}
if (keySelector is null)
{
ThrowHelper.ThrowArgumentNullException(ExceptionArgument.keySelector);
}

return source.CreateOrderedEnumerable(keySelector, comparer, true);
}
=> source.CreateOrderedEnumerable(keySelector, comparer, true);
}

public interface IOrderedEnumerable<out TElement> : IEnumerable<TElement>
Expand Down