azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename sortedDescendingBy to sortedByDescending

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-07-27 20:08:44 +03:00
parent 002c3e850f
commit 521e0b679d
5 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/generated/_Ordering.kt
+79 -79
View File
@@ -182,7 +182,7 @@ public fun <T : Comparable<T>> Iterable<T>.sortDescending(): List<T> {
/**
* Returns a sorted list of all elements, in descending order by results of specified [order] function.
*/
deprecated("This method may change its behavior soon. Use sortedDescendingBy() instead.", ReplaceWith("sortedDescendingBy(order)"))
deprecated("This method may change its behavior soon. Use sortedByDescending() instead.", ReplaceWith("sortedByDescending(order)"))
public inline fun <T, R : Comparable<R>> Array<out T>.sortDescendingBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (T) -> R): List<T> {
val sortedList = toArrayList()
val sortBy: Comparator<T> = compareByDescending(order)
@@ -193,7 +193,7 @@ public inline fun <T, R : Comparable<R>> Array<out T>.sortDescendingBy(inlineOpt
/**
* Returns a sorted list of all elements, in descending order by results of specified [order] function.
*/
deprecated("This method may change its behavior soon. Use sortedDescendingBy() instead.", ReplaceWith("sortedDescendingBy(order)"))
deprecated("This method may change its behavior soon. Use sortedByDescending() instead.", ReplaceWith("sortedByDescending(order)"))
public inline fun <T, R : Comparable<R>> Iterable<T>.sortDescendingBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (T) -> R): List<T> {
val sortedList = toArrayList()
val sortBy: Comparator<T> = compareByDescending(order)
@@ -372,6 +372,83 @@ public inline fun <T, R : Comparable<R>> Sequence<T>.sortedBy(inlineOptions(Inli
return sortedWith(compareBy(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <T, R : Comparable<R>> Array<out T>.sortedByDescending(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (T) -> R?): List<T> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> BooleanArray.sortedByDescending(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Boolean) -> R?): List<Boolean> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> ByteArray.sortedByDescending(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Byte) -> R?): List<Byte> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> CharArray.sortedByDescending(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Char) -> R?): List<Char> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> DoubleArray.sortedByDescending(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Double) -> R?): List<Double> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> FloatArray.sortedByDescending(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Float) -> R?): List<Float> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> IntArray.sortedByDescending(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Int) -> R?): List<Int> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> LongArray.sortedByDescending(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Long) -> R?): List<Long> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> ShortArray.sortedByDescending(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Short) -> R?): List<Short> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <T, R : Comparable<R>> Iterable<T>.sortedByDescending(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (T) -> R?): List<T> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a sequence that yields elements of this sequence sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <T, R : Comparable<R>> Sequence<T>.sortedByDescending(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (T) -> R?): Sequence<T> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to their natural sort order.
*/
@@ -442,83 +519,6 @@ public fun <T : Comparable<T>> Sequence<T>.sortedDescending(): Sequence<T> {
return sortedWith(comparator { x, y -> y.compareTo(x) })
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <T, R : Comparable<R>> Array<out T>.sortedDescendingBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (T) -> R?): List<T> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> BooleanArray.sortedDescendingBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Boolean) -> R?): List<Boolean> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> ByteArray.sortedDescendingBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Byte) -> R?): List<Byte> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> CharArray.sortedDescendingBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Char) -> R?): List<Char> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> DoubleArray.sortedDescendingBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Double) -> R?): List<Double> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> FloatArray.sortedDescendingBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Float) -> R?): List<Float> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> IntArray.sortedDescendingBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Int) -> R?): List<Int> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> LongArray.sortedDescendingBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Long) -> R?): List<Long> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <R : Comparable<R>> ShortArray.sortedDescendingBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (Short) -> R?): List<Short> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <T, R : Comparable<R>> Iterable<T>.sortedDescendingBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (T) -> R?): List<T> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a sequence that yields elements of this sequence sorted descending according to natural sort order of the value returned by specified [order] function.
*/
public inline fun <T, R : Comparable<R>> Sequence<T>.sortedDescendingBy(inlineOptions(InlineOption.ONLY_LOCAL_RETURN) order: (T) -> R?): Sequence<T> {
return sortedWith(compareByDescending(order))
}
/**
* Returns a list of all elements sorted according to the specified [comparator].
*/
libraries/stdlib/test/collections/ArraysTest.kt
+2 -2
View File
@@ -828,8 +828,8 @@ class ArraysTest {
fun String.nullIfEmpty() = if (isEmpty()) null else this
arrayOf(null, "").let {
expect(listOf(null, "")) { it.sortedBy { it.orEmpty()}}
expect(listOf("", null)) { it.sortedDescendingBy { it.orEmpty() }}
expect(listOf("", null)) { it.sortedDescendingBy { it?.nullIfEmpty() }}
expect(listOf("", null)) { it.sortedByDescending { it.orEmpty() }}
expect(listOf("", null)) { it.sortedByDescending { it?.nullIfEmpty() }}
}
}
libraries/stdlib/test/collections/CollectionTest.kt
+3 -3
View File
@@ -567,15 +567,15 @@ class CollectionTest {
test fun sortedBy() {
assertEquals(listOf("two" to 2, "three" to 3), listOf("three" to 3, "two" to 2).sortedBy { it.second })
assertEquals(listOf("three" to 3, "two" to 2), listOf("three" to 3, "two" to 2).sortedBy { it.first })
assertEquals(listOf("three", "two"), listOf("two", "three").sortedDescendingBy { it.length() })
assertEquals(listOf("three", "two"), listOf("two", "three").sortedByDescending { it.length() })
}
test fun sortedNullableBy() {
fun String.nullIfEmpty() = if (isEmpty()) null else this
listOf(null, "").let {
expect(listOf(null, "")) { it.sortedBy { it.orEmpty()}}
expect(listOf("", null)) { it.sortedDescendingBy { it.orEmpty() }}
expect(listOf("", null)) { it.sortedDescendingBy { it?.nullIfEmpty() }}
expect(listOf("", null)) { it.sortedByDescending { it.orEmpty() }}
expect(listOf("", null)) { it.sortedByDescending { it?.nullIfEmpty() }}
}
}
libraries/stdlib/test/collections/SequenceTest.kt
+2 -2
View File
@@ -323,12 +323,12 @@ public class SequenceTest {
test fun sortedBy() {
sequenceOf("it", "greater", "less").let {
it.sortedBy { it.length() }.iterator().assertSorted { a, b -> compareValuesBy(a, b) { it.length() } <= 0 }
it.sortedDescendingBy { it.length() }.iterator().assertSorted { a, b -> compareValuesBy(a, b) { it.length() } >= 0 }
it.sortedByDescending { it.length() }.iterator().assertSorted { a, b -> compareValuesBy(a, b) { it.length() } >= 0 }
}
sequenceOf('a', 'd', 'c', null).let {
it.sortedBy {it}.iterator().assertSorted { a, b -> compareValues(a, b) <= 0 }
it.sortedDescendingBy {it}.iterator().assertSorted { a, b -> compareValues(a, b) >= 0 }
it.sortedByDescending {it}.iterator().assertSorted { a, b -> compareValues(a, b) >= 0 }
}
}