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

added annotations for Collections and Arrays

Browse Source
This commit is contained in:
Svetlana Isakova
2012-09-24 14:18:04 +04:00
parent 32d707ca9b
commit 85f3dbf4fc
10 changed files with 409 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.kt
+1 -1
View File
@@ -6,7 +6,7 @@ import java.util.Collections.*
fun foo(list: List<String>) : String {
val w : String = max(list, comparator<String?> {o1, o2 -> 1
})!!
})
return w
}
compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt
+2 -2
View File
@@ -8,6 +8,6 @@ fun test() {
//here possibly can be a cycle on constraints
val <!UNUSED_VARIABLE!>x<!> = g { Collections.<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>() }
val <!UNUSED_VARIABLE!>y<!> = g<Int> { Collections.emptyList()!! }
val <!UNUSED_VARIABLE!>z<!> : List<Int> = g { Collections.emptyList()!! }
val <!UNUSED_VARIABLE!>y<!> = g<Int> { Collections.emptyList() }
val <!UNUSED_VARIABLE!>z<!> : List<Int> = g { Collections.emptyList() }
}
compiler/testData/diagnostics/tests/regressions/kt335.336.kt
+1 -1
View File
@@ -3,7 +3,7 @@
import java.util.*
fun <T : Comparable<T>> List<T>.sort() {
fun <T : Comparable<T>> MutableList<T>.sort() {
Collections.sort(this) // Error here
}
idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnType.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// "Specify type explicitly" "true"
package a
public val <caret>l: MutableList<Int>? = java.util.Collections.emptyList<Int>()
public val <caret>l: MutableList<Int> = java.util.Collections.emptyList<Int>()
idea/testData/quickfix/typeImports/afterHasThisImport.kt
+1 -1
View File
@@ -9,7 +9,7 @@ import java.util.List
class M {
trait A {
val l<caret>: MutableList<Int>?
val l<caret>: MutableList<Int>
}
}
}
idea/testData/quickfix/typeImports/afterToImport1.kt
+1 -1
View File
@@ -5,6 +5,6 @@ import java.util.Collections
class M {
trait A {
abstract val l<caret>: MutableList<Int>?
abstract val l<caret>: MutableList<Int>
}
}
jdk-annotations/java/util/annotations.xml
+396 -1
View File
@@ -751,6 +751,8 @@
<val name="value" val="&quot;fun clone() : Any&quot;"/>
</annotation>
</item>
<!-- java.util.Arrays -->
<item name='java.util.Arrays java.util.List&lt;T&gt; asList(T...)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun &lt;T&gt; asList(vararg a : T) : List&lt;T&gt;&quot;"/>
@@ -759,7 +761,7 @@
<item name='java.util.Arrays void sort(T[], java.util.Comparator&lt;? super T&gt;)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T&gt; sort(a : Array&lt;out T?&gt;, c : Comparator&lt;in T&gt;?) : Unit&quot;"/>
val="&quot;fun &lt;T&gt; sort(a : Array&lt;out T&gt;, c : Comparator&lt;in T&gt;?) : Unit&quot;"/>
</annotation>
</item>
<item name='java.util.Arrays void sort(java.lang.Object[])'>
@@ -767,6 +769,399 @@
<val name="value" val="&quot;fun sort(a : Array&lt;out Any?&gt;) : Unit&quot;"/>
</annotation>
</item>
<item name='java.util.Arrays void sort(java.lang.Object[], int, int)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun sort(a : Array&lt;out Any?&gt;, fromIndex : Int, toIndex : Int) : Unit&quot;"/>
</annotation>
</item>
<item name='java.util.Arrays void sort(T[], int, int, java.util.Comparator&lt;? super T&gt;)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T&gt; sort(a : Array&lt;T&gt;, fromIndex : Int, toIndex : Int, c : Comparator&lt;in T&gt;?) : Unit&quot;"/>
</annotation>
</item>
<item name='java.util.Arrays int binarySearch(java.lang.Object[], java.lang.Object)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun binarySearch(a : Array&lt;out Any?&gt;, key : Any?) : Int&quot;"/>
</annotation>
</item>
<item name='java.util.Arrays int binarySearch(java.lang.Object[], int, int, java.lang.Object)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun binarySearch(a : Array&lt;out Any?&gt;, fromIndex : Int, toIndex : Int, key : Any?) : Int&quot;"/>
</annotation>
</item>
<item name='java.util.Arrays int binarySearch(T[], T, java.util.Comparator&lt;? super T&gt;)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T&gt; binarySearch(a : Array&lt;out T&gt;, key : T, c : Comparator&lt;in T&gt;?) : Int&quot;"/>
</annotation>
</item>
<item name='java.util.Arrays int binarySearch(T[], int, int, T, java.util.Comparator&lt;? super T&gt;)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T&gt; binarySearch(a : Array&lt;out T&gt;, fromIndex : Int, toIndex : Int, key : T, c : Comparator&lt;in T&gt;?) : Int&quot;"/>
</annotation>
</item>
<item name='java.util.Arrays boolean equals(java.lang.Object[], java.lang.Object[]) 0'>
<annotation name='org.jetbrains.annotations.Nullable'/>
</item>
<item name='java.util.Arrays boolean equals(java.lang.Object[], java.lang.Object[]) 1'>
<annotation name='org.jetbrains.annotations.Nullable'/>
</item>
<item name='java.util.Arrays boolean equals(java.lang.Object[], java.lang.Object[])'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun equals(a : Array&lt;out Any?&gt;?, a2 : Array&lt;out Any?&gt;?) : Boolean&quot;"/>
</annotation>
</item>
<item name='java.util.Arrays void fill(java.lang.Object[], java.lang.Object) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Arrays void fill(java.lang.Object[], int, int, java.lang.Object) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Arrays T[] copyOf(U[], int, java.lang.Class&lt;? extends T[]&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Arrays T[] copyOf(U[], int, java.lang.Class&lt;? extends T[]&gt;) 2'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Arrays T[] copyOf(U[], int, java.lang.Class&lt;? extends T[]&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T, U&gt; copyOf(original : Array&lt;out U&gt;, newLength : Int, newType : Class&lt;out Array&lt;T&gt;&gt;) : Array&lt;T&gt;&quot;"/>
</annotation>
</item>
<item name='java.util.Arrays T[] copyOfRange(T[], int, int)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Arrays T[] copyOfRange(T[], int, int) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Arrays T[] copyOf(T[], int)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T&gt; copyOf(original : Array&lt;out T&gt;, newLength : Int) : Array&lt;T?&gt;&quot;"/>
</annotation>
</item>
<!-- java.util.Collections -->
<item name='java.util.Collections void sort(java.util.List&lt;T&gt;)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T : Comparable&lt;in T&gt;&gt; sort(list : MutableList&lt;T&gt;) : Unit&quot;"/>
</annotation>
</item>
<item name='java.util.Collections void sort(java.util.List&lt;T&gt;, java.util.Comparator&lt;? super T&gt;)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T&gt; sort(list : MutableList&lt;T&gt;, c : Comparator&lt;in T&gt;) : Unit&quot;"/>
</annotation>
</item>
<item name='java.util.Collections void reverse(java.util.List&lt;?&gt;)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun reverse(list : MutableList&lt;out Any?&gt;) : Unit&quot;"/>
</annotation>
</item>
<item name='java.util.Collections void shuffle(java.util.List&lt;?&gt;)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun shuffle(list : MutableList&lt;out Any?&gt;) : Unit&quot;"/>
</annotation>
</item>
<item name='java.util.Collections void shuffle(java.util.List&lt;?&gt;, java.util.Random)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun shuffle(list : MutableList&lt;out Any?&gt;, rnd : Random) : Unit&quot;"/>
</annotation>
</item>
<item name='java.util.Collections void swap(java.util.List&lt;?&gt;, int, int)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun swap(list : MutableList&lt;out Any?&gt;, i : Int, j : Int) : Unit&quot;"/>
</annotation>
</item>
<item name='java.util.Collections void fill(java.util.List&lt;? super T&gt;, T)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun &lt;T&gt; fill(list : MutableList&lt;in T&gt;, obj : T) : Unit&quot;"/>
</annotation>
</item>
<item name='java.util.Collections void copy(java.util.List&lt;? super T&gt;, java.util.List&lt;? extends T&gt;)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T&gt; copy(dest : MutableList&lt;in T&gt;, src : List&lt;out T&gt;) : Unit&quot;"/>
</annotation>
</item>
<item name='java.util.Collections void rotate(java.util.List&lt;?&gt;, int)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value" val="&quot;fun rotate(list : MutableList&lt;out Any?&gt;, distance : Int) : Unit&quot;"/>
</annotation>
</item>
<item name='java.util.Collections boolean replaceAll(java.util.List&lt;T&gt;, T, T)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T&gt; replaceAll(list : MutableList&lt;T&gt;, oldVal : T, newVal : T) : Boolean&quot;"/>
</annotation>
</item>
<item name='java.util.Collections int binarySearch(java.util.List&lt;? extends java.lang.Comparable&lt;? super T&gt;&gt;, T)'>
<annotation name='jet.runtime.typeinfo.KotlinSignature'>
<val name="value"
val="&quot;fun &lt;T&gt; binarySearch(list : List&lt;out Comparable&lt;in T&gt;&gt;, key : T) : Int&quot;"/>
</annotation>
</item>
<item name='java.util.Collections int binarySearch(java.util.List&lt;? extends T&gt;, T, java.util.Comparator&lt;? super T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections int binarySearch(java.util.List&lt;? extends T&gt;, T, java.util.Comparator&lt;? super T&gt;) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections int binarySearch(java.util.List&lt;? extends T&gt;, T, java.util.Comparator&lt;? super T&gt;) 2'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections T min(java.util.Collection&lt;? extends T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections T min(java.util.Collection&lt;? extends T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections T min(java.util.Collection&lt;? extends T&gt;, java.util.Comparator&lt;? super T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections T min(java.util.Collection&lt;? extends T&gt;, java.util.Comparator&lt;? super T&gt;) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections T min(java.util.Collection&lt;? extends T&gt;, java.util.Comparator&lt;? super T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections T max(java.util.Collection&lt;? extends T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections T max(java.util.Collection&lt;? extends T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections T max(java.util.Collection&lt;? extends T&gt;, java.util.Comparator&lt;? super T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections T max(java.util.Collection&lt;? extends T&gt;, java.util.Comparator&lt;? super T&gt;) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections T max(java.util.Collection&lt;? extends T&gt;, java.util.Comparator&lt;? super T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections int indexOfSubList(java.util.List&lt;?&gt;, java.util.List&lt;?&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections int indexOfSubList(java.util.List&lt;?&gt;, java.util.List&lt;?&gt;) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections int lastIndexOfSubList(java.util.List&lt;?&gt;, java.util.List&lt;?&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections int lastIndexOfSubList(java.util.List&lt;?&gt;, java.util.List&lt;?&gt;) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Collection&lt;T&gt; unmodifiableCollection(java.util.Collection&lt;? extends T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Collection&lt;T&gt; unmodifiableCollection(java.util.Collection&lt;? extends T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Set&lt;T&gt; unmodifiableSet(java.util.Set&lt;? extends T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Set&lt;T&gt; unmodifiableSet(java.util.Set&lt;? extends T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedSet&lt;T&gt; unmodifiableSortedSet(java.util.SortedSet&lt;T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedSet&lt;T&gt; unmodifiableSortedSet(java.util.SortedSet&lt;T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.List&lt;T&gt; unmodifiableList(java.util.List&lt;? extends T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.List&lt;T&gt; unmodifiableList(java.util.List&lt;? extends T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Map&lt;K,V&gt; unmodifiableMap(java.util.Map&lt;? extends K,? extends V&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Map&lt;K,V&gt; unmodifiableMap(java.util.Map&lt;? extends K,? extends V&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedMap&lt;K,V&gt; unmodifiableSortedMap(java.util.SortedMap&lt;K,? extends V&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedMap&lt;K,V&gt; unmodifiableSortedMap(java.util.SortedMap&lt;K,? extends V&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Collection&lt;T&gt; synchronizedCollection(java.util.Collection&lt;T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Collection&lt;T&gt; synchronizedCollection(java.util.Collection&lt;T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Set&lt;T&gt; synchronizedSet(java.util.Set&lt;T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Set&lt;T&gt; synchronizedSet(java.util.Set&lt;T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Set&lt;T&gt; synchronizedSet(java.util.Set&lt;T&gt;, java.lang.Object) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Set&lt;T&gt; synchronizedSet(java.util.Set&lt;T&gt;, java.lang.Object) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Set&lt;T&gt; synchronizedSet(java.util.Set&lt;T&gt;, java.lang.Object)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedSet&lt;T&gt; synchronizedSortedSet(java.util.SortedSet&lt;T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedSet&lt;T&gt; synchronizedSortedSet(java.util.SortedSet&lt;T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.List&lt;T&gt; synchronizedList(java.util.List&lt;T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.List&lt;T&gt; synchronizedList(java.util.List&lt;T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.List&lt;T&gt; synchronizedList(java.util.List&lt;T&gt;, java.lang.Object) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.List&lt;T&gt; synchronizedList(java.util.List&lt;T&gt;, java.lang.Object) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.List&lt;T&gt; synchronizedList(java.util.List&lt;T&gt;, java.lang.Object)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Map&lt;K,V&gt; synchronizedMap(java.util.Map&lt;K,V&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Map&lt;K,V&gt; synchronizedMap(java.util.Map&lt;K,V&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedMap&lt;K,V&gt; synchronizedSortedMap(java.util.SortedMap&lt;K,V&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedMap&lt;K,V&gt; synchronizedSortedMap(java.util.SortedMap&lt;K,V&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Collection&lt;E&gt; checkedCollection(java.util.Collection&lt;E&gt;, java.lang.Class&lt;E&gt;) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Collection&lt;E&gt; checkedCollection(java.util.Collection&lt;E&gt;, java.lang.Class&lt;E&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Collection&lt;E&gt; checkedCollection(java.util.Collection&lt;E&gt;, java.lang.Class&lt;E&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Set&lt;E&gt; checkedSet(java.util.Set&lt;E&gt;, java.lang.Class&lt;E&gt;) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Set&lt;E&gt; checkedSet(java.util.Set&lt;E&gt;, java.lang.Class&lt;E&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Set&lt;E&gt; checkedSet(java.util.Set&lt;E&gt;, java.lang.Class&lt;E&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedSet&lt;E&gt; checkedSortedSet(java.util.SortedSet&lt;E&gt;, java.lang.Class&lt;E&gt;) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedSet&lt;E&gt; checkedSortedSet(java.util.SortedSet&lt;E&gt;, java.lang.Class&lt;E&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedSet&lt;E&gt; checkedSortedSet(java.util.SortedSet&lt;E&gt;, java.lang.Class&lt;E&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.List&lt;E&gt; checkedList(java.util.List&lt;E&gt;, java.lang.Class&lt;E&gt;) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.List&lt;E&gt; checkedList(java.util.List&lt;E&gt;, java.lang.Class&lt;E&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.List&lt;E&gt; checkedList(java.util.List&lt;E&gt;, java.lang.Class&lt;E&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedMap&lt;K,V&gt; checkedSortedMap(java.util.SortedMap&lt;K,V&gt;, java.lang.Class&lt;K&gt;, java.lang.Class&lt;V&gt;) 2'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedMap&lt;K,V&gt; checkedSortedMap(java.util.SortedMap&lt;K,V&gt;, java.lang.Class&lt;K&gt;, java.lang.Class&lt;V&gt;) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedMap&lt;K,V&gt; checkedSortedMap(java.util.SortedMap&lt;K,V&gt;, java.lang.Class&lt;K&gt;, java.lang.Class&lt;V&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.SortedMap&lt;K,V&gt; checkedSortedMap(java.util.SortedMap&lt;K,V&gt;, java.lang.Class&lt;K&gt;, java.lang.Class&lt;V&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Set&lt;T&gt; emptySet()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.List&lt;T&gt; emptyList()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Map&lt;K,V&gt; emptyMap()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Set&lt;T&gt; singleton(T)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.List&lt;T&gt; singletonList(T)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Map&lt;K,V&gt; singletonMap(K, V)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.List&lt;T&gt; nCopies(int, T)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Comparator&lt;T&gt; reverseOrder()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Enumeration&lt;T&gt; enumeration(java.util.Collection&lt;T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Enumeration&lt;T&gt; enumeration(java.util.Collection&lt;T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.ArrayList&lt;T&gt; list(java.util.Enumeration&lt;T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.ArrayList&lt;T&gt; list(java.util.Enumeration&lt;T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections int frequency(java.util.Collection&lt;?&gt;, java.lang.Object) 1'>
<annotation name='org.jetbrains.annotations.Nullable'/>
</item>
<item name='java.util.Collections int frequency(java.util.Collection&lt;?&gt;, java.lang.Object) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections boolean disjoint(java.util.Collection&lt;?&gt;, java.util.Collection&lt;?&gt;) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections boolean disjoint(java.util.Collection&lt;?&gt;, java.util.Collection&lt;?&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections boolean addAll(java.util.Collection&lt;? super T&gt;, T...) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Set&lt;E&gt; newSetFromMap(java.util.Map&lt;E,java.lang.Boolean&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Set&lt;E&gt; newSetFromMap(java.util.Map&lt;E,java.lang.Boolean&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Queue&lt;T&gt; asLifoQueue(java.util.Deque&lt;T&gt;) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name='java.util.Collections java.util.Queue&lt;T&gt; asLifoQueue(java.util.Deque&lt;T&gt;)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<!-- java.util.Timer -->
<item name='java.util.Timer Timer(java.lang.String, boolean) 0'>
<annotation name='org.jetbrains.annotations.NotNull'/>
libraries/stdlib/src/kotlin/IterablesSpecial.kt
+3 -3
View File
@@ -106,14 +106,14 @@ public fun <T> Iterable<T>.withIndices(): List<Pair<Int, T>> {
return answer
}
public inline fun <in T: Comparable<T>> Iterable<T>.sort() : List<T> {
val list = toList()
public inline fun <in T: Comparable<T>> MutableIterable<T>.sort() : List<T> {
val list = toCollection(ArrayList<T>())
java.util.Collections.sort(list)
return list
}
public inline fun <in T> Iterable<T>.sort(comparator: java.util.Comparator<T>) : List<T> {
val list = toList()
val list = toCollection(ArrayList<T>())
java.util.Collections.sort(list, comparator)
return list
}
libraries/stdlib/src/kotlin/IterablesSpecialJVM.kt
+2 -1
View File
@@ -2,6 +2,7 @@ package kotlin
import java.util.AbstractList
import java.util.Comparator
import java.util.ArrayList
// TODO this function is here as it breaks the JS compiler; lets move back to JLangIterablesSpecial when it works again :)
@@ -13,7 +14,7 @@ import java.util.Comparator
* @includeFunctionBody ../../test/CollectionTest.kt sortBy
*/
public inline fun <in T, R: Comparable<in R>> Iterable<T>.sortBy(f: (T) -> R): List<T> {
val sortedList = this.toList()
val sortedList = toCollection(ArrayList<T>())
val sortBy: Comparator<T> = comparator<T> {(x: T, y: T) ->
val xr = f(x)
val yr = f(y)
libraries/stdlib/src/kotlin/JUtil.kt
+1 -1
View File
@@ -36,7 +36,7 @@ public inline fun <T> Collection<T>?.orEmpty() : Collection<T>
/** TODO these functions don't work when they generate the Array<T> versions when they are in JLIterables */
public inline fun <in T: Comparable<T>> Iterable<T>.toSortedList() : List<T> = toList().sort()
public inline fun <in T: Comparable<T>> Iterable<T>.toSortedList() : List<T> = toCollection(ArrayList<T>()).sort()
public inline fun <in T: Comparable<T>> Iterable<T>.toSortedList(comparator: java.util.Comparator<T>) : List<T> = toList().sort(comparator)