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

Improve onEach templates.

Browse Source 
Add new functions to reference API.
Add tests for onEach
  #KT-8220
This commit is contained in:
Ilya Gorbunov
2016-10-01 03:51:59 +03:00
parent 5bde230d4a
commit dc57d69085
10 changed files with 115 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib.txt
+4
View File
@@ -1512,6 +1512,7 @@ public final class kotlin/collections/CollectionsKt {
public static final fun mutableListOf ([Ljava/lang/Object;)Ljava/util/List;
public static final fun none (Ljava/lang/Iterable;)Z
public static final fun none (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;)Z
public static final fun onEach (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;)Ljava/lang/Iterable;
public static final fun partition (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;)Lkotlin/Pair;
public static final fun plus (Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
public static final fun plus (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/util/List;
@@ -1647,6 +1648,7 @@ public final class kotlin/collections/MapsKt {
public static final fun mutableMapOf ([Lkotlin/Pair;)Ljava/util/Map;
public static final fun none (Ljava/util/Map;)Z
public static final fun none (Ljava/util/Map;Lkotlin/jvm/functions/Function1;)Z
public static final fun onEach (Ljava/util/Map;Lkotlin/jvm/functions/Function1;)Ljava/util/Map;
public static final fun plus (Ljava/util/Map;Ljava/lang/Iterable;)Ljava/util/Map;
public static final fun plus (Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map;
public static final fun plus (Ljava/util/Map;Lkotlin/Pair;)Ljava/util/Map;
@@ -2056,6 +2058,7 @@ public final class kotlin/sequences/SequencesKt {
public static final fun minus (Lkotlin/sequences/Sequence;[Ljava/lang/Object;)Lkotlin/sequences/Sequence;
public static final fun none (Lkotlin/sequences/Sequence;)Z
public static final fun none (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Z
public static final fun onEach (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
public static final fun partition (Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/Pair;
public static final fun plus (Lkotlin/sequences/Sequence;Ljava/lang/Iterable;)Lkotlin/sequences/Sequence;
public static final fun plus (Lkotlin/sequences/Sequence;Ljava/lang/Object;)Lkotlin/sequences/Sequence;
@@ -2404,6 +2407,7 @@ public final class kotlin/text/StringsKt {
public static final fun minWith (Ljava/lang/CharSequence;Ljava/util/Comparator;)Ljava/lang/Character;
public static final fun none (Ljava/lang/CharSequence;)Z
public static final fun none (Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Z
public static final fun onEach (Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function1;)Ljava/lang/CharSequence;
public static final fun padEnd (Ljava/lang/CharSequence;IC)Ljava/lang/CharSequence;
public static final fun padEnd (Ljava/lang/String;IC)Ljava/lang/String;
public static synthetic fun padEnd$default (Ljava/lang/CharSequence;ICILjava/lang/Object;)Ljava/lang/CharSequence;
libraries/tools/kotlin-stdlib-gen/src/templates/Aggregates.kt
+24 -14
View File
@@ -719,27 +719,37 @@ fun aggregates(): List<GenericFunction> {
}
}
templates add f("onEach(action: (T) -> Unit)") {
inline(true)
doc { f -> "Performs the given [action] on each ${f.element} and returns the receiver afterwards." }
returns("SELF")
templates addAll listOf(Iterables, Maps, CharSequences).map { f -> f("onEach(action: (T) -> Unit)") {
only(f)
since("1.1")
inline(true)
doc { f -> "Performs the given [action] on each ${f.element} and returns the ${f.collection} itself afterwards." }
val collectionType = when(f) {
Maps -> "M"
CharSequences -> "S"
else -> "C"
}
customReceiver(collectionType)
returns(collectionType)
typeParam("$collectionType : SELF")
body {
"""
return apply { for (element in this) action(element) }
"""
}
include(Maps, CharSequences)
}}
exclude(Iterables)
typeParam(Generic) { "I: Iterable<E>" }
typeParam(Generic) { "E" }
customReceiver(Generic) { "I" }
returns(Generic) { "I" }
doc(Sequences) { f -> "Applies the supplied [action] on each ${f.element} of the Sequence as they pass through it." }
inline(false, Sequences)
returns(Sequences) { "Sequence<T>" }
templates add f("onEach(action: (T) -> Unit)") {
only(Sequences)
since("1.1")
returns("SELF")
doc { f ->
"""
Returns a sequence which performs the given [action] on each ${f.element} of the original sequence as they pass though it.
"""
}
body(Sequences) {
"""
return map {