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

tests changes after collections mapping

Browse Source
This commit is contained in:
Svetlana Isakova
2012-09-04 17:03:39 +04:00
parent 2cad93e4be
commit 7d37df5f38
65 changed files with 75 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/jdk-annotations/hashMap.kt
+1 -1
View File
@@ -1,7 +1,7 @@
import java.util.*
fun box(): String {
val map: Map<String, Int> = HashMap<String, Int>()
val map: MutableMap<String, Int> = HashMap<String, Int>()
map.put("a", 1)
map.put("bb", 2)
map.put("ccc", 3)
compiler/testData/codegen/regressions/kt1397.kt
+1 -1
View File
@@ -1,7 +1,7 @@
import java.util.ArrayList
class IntArrayList(): ArrayList<Int>() {
override fun get(index: Int): Int = super.get(index)!!
override fun get(index: Int): Int = super.get(index)
}
fun box(): String {
compiler/testData/codegen/regressions/kt2395.kt
+1 -1
View File
@@ -2,7 +2,7 @@ import java.util.AbstractList
class MyList(): AbstractList<String>() {
public fun getModificationCount(): Int = modCount
public override fun get(index: Int): String? = ""
public override fun get(index: Int): String = ""
public override fun size(): Int = 0
}
compiler/testData/codegen/regressions/kt950.jet
+1 -1
View File
@@ -1,6 +1,6 @@
import java.util.*
fun <K, V> Map<K, V>.set(k : K, v : V) = put(k, v)
fun <K, V> MutableMap<K, V>.set(k : K, v : V) = put(k, v)
fun box() : String {
val map = HashMap<String,String>()
compiler/testData/codegen/super/basicmethodSuperClass.jet
+1 -1
View File
@@ -1,7 +1,7 @@
import java.util.ArrayList
class N() : ArrayList<Any>() {
override fun add(el: Any?) : Boolean {
override fun add(el: Any) : Boolean {
if (!super<ArrayList>.add(el)) {
throw Exception()
}
compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt
-2
View File
@@ -1,3 +1 @@
import java.util.List
fun ggg(list: List<Int>) = list
compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt
-2
View File
@@ -1,3 +1 @@
import java.util.List
fun ff(p: List<String>) = 1
compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt
-2
View File
@@ -1,3 +1 @@
import java.util.List
fun <P> listOfT(list: List<P>) = list
compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt
-1
View File
@@ -1,3 +1,2 @@
import java.util.Map
fun <K> fff(map: Map<K, String>) = map
compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt
-1
View File
@@ -1,3 +1,2 @@
import java.util.Map
fun fff(map: Map<String, Int?>) = map
compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt
-2
View File
@@ -1,3 +1 @@
import java.util.List
fun <P1 : List<String>> id(p: P1) = p
compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt
-2
View File
@@ -1,3 +1 @@
import java.util.List;
fun gg(list: List<String>, vararg ints: Int) = list
compiler/testData/loadJava/ClassWithTypePExtendsIterableP.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package test
public abstract class ClassWithTypePExtendsIterableP<P>() : jet.Iterable<P> {
public abstract class ClassWithTypePExtendsIterableP<P>() : jet.MutableIterable<P> {
}
compiler/testData/loadJava/ClassWithTypePExtendsIterableP.txt
+2 -2
View File
@@ -1,6 +1,6 @@
namespace test
public abstract class test.ClassWithTypePExtendsIterableP</*0*/ P : jet.Any?> : jet.Iterable<P> {
public abstract class test.ClassWithTypePExtendsIterableP</*0*/ P : jet.Any?> : jet.MutableIterable<P> {
public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypePExtendsIterableP<P>
public abstract override /*1*/ fun iterator(): jet.Iterator<P>
public abstract override /*1*/ fun iterator(): jet.MutableIterator<P>
}
compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.MethodWithGenerics : java.lang.Object {
public final /*constructor*/ fun <init>(): test.MethodWithGenerics
public open fun foo(/*0*/ p0: jet.String, /*1*/ p1: java.util.List<java.util.Map.Entry<jet.String?, jet.String>?>): jet.String
public open fun foo(/*0*/ p0: jet.String, /*1*/ p1: jet.List<jet.Map.Entry<jet.String?, jet.String>?>): jet.String
}
compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.MethodWithTypeParameters : java.lang.Object {
public final /*constructor*/ fun <init>(): test.MethodWithTypeParameters
public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable & java.util.List<java.lang.Cloneable>>foo(/*0*/ p0: A, /*1*/ p1: java.util.List<out B>, /*2*/ p2: java.util.List<in jet.String?>): jet.Tuple0
public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable & jet.List<java.lang.Cloneable>>foo(/*0*/ p0: A, /*1*/ p1: jet.List<out B>, /*2*/ p2: jet.List<in jet.String?>): jet.Tuple0
}
compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.WrongReturnTypeStructure : java.lang.Object {
public final /*constructor*/ fun <init>(): test.WrongReturnTypeStructure
public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: java.util.List<java.util.Map.Entry<jet.String?, jet.String?>?>?): jet.String?
public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String?, jet.String?>?>?): jet.String?
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.WrongTypeParameterBoundStructure1 : java.lang.Object {
public final /*constructor*/ fun <init>(): test.WrongTypeParameterBoundStructure1
public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable? & java.util.List<java.lang.Cloneable?>?>foo(/*0*/ p0: A?, /*1*/ p1: java.util.List<out B>?, /*2*/ p2: java.util.List<in jet.String?>?): jet.Tuple0
public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable? & jet.List<java.lang.Cloneable?>?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<out B>?, /*2*/ p2: jet.List<in jet.String?>?): jet.Tuple0
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.WrongTypeParameterBoundStructure2 : java.lang.Object {
public final /*constructor*/ fun <init>(): test.WrongTypeParameterBoundStructure2
public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable? & java.util.List<java.lang.Cloneable?>?>foo(/*0*/ p0: A?, /*1*/ p1: java.util.List<out B>?, /*2*/ p2: java.util.List<in jet.String?>?): jet.Tuple0
public open fun </*0*/ A : jet.Any?, /*1*/ B : java.lang.Runnable? & jet.List<java.lang.Cloneable?>?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<out B>?, /*2*/ p2: jet.List<in jet.String?>?): jet.Tuple0
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.WrongTypeParametersCount : java.lang.Object {
public final /*constructor*/ fun <init>(): test.WrongTypeParametersCount
public open fun </*0*/ A : jet.Any?, /*1*/ B : jet.Any?>foo(/*0*/ p0: A?, /*1*/ p1: java.util.List<out B>?): jet.Tuple0
public open fun </*0*/ A : jet.Any?, /*1*/ B : jet.Any?>foo(/*0*/ p0: A?, /*1*/ p1: jet.List<out B>?): jet.Tuple0
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.java
+1 -1
View File
@@ -8,7 +8,7 @@ import java.util.List;
import jet.runtime.typeinfo.KotlinSignature;
public class WrongTypeVariance {
@KotlinSignature("fun copy(a : List<out Number>, b : List<Number>) : List<Number>")
@KotlinSignature("fun copy(a : List<out Number>, b : List<Number>) : MutableList<Number>")
public List<Number> copy(List<? extends Number> from, List<? super Number> to) {
throw new UnsupportedOperationException();
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package test
import java.util.*
public open class WrongTypeVariance : Object() {
public open fun copy(p0 : List<out jet.Number?>?, p1 : List<in jet.Number?>?) : List<jet.Number?>? {
public open fun copy(p0 : List<out jet.Number?>?, p1 : List<in jet.Number?>?) : MutableList<jet.Number?>? {
throw UnsupportedOperationException()
}
}
compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.WrongTypeVariance : java.lang.Object {
public final /*constructor*/ fun <init>(): test.WrongTypeVariance
public open fun copy(/*0*/ p0: java.util.List<out jet.Number?>?, /*1*/ p1: java.util.List<in jet.Number?>?): java.util.List<jet.Number?>?
public open fun copy(/*0*/ p0: jet.List<out jet.Number?>?, /*1*/ p1: jet.List<in jet.Number?>?): jet.MutableList<jet.Number?>?
}
compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.WrongValueParameterStructure1 : java.lang.Object {
public final /*constructor*/ fun <init>(): test.WrongValueParameterStructure1
public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: java.util.List<java.util.Map.Entry<jet.String?, jet.String?>?>?): jet.String?
public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String?, jet.String?>?>?): jet.String?
}
compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public open class test.WrongValueParameterStructure2 : java.lang.Object {
public final /*constructor*/ fun <init>(): test.WrongValueParameterStructure2
public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: java.util.List<java.util.Map.Entry<jet.String?, jet.String?>?>?): jet.String?
public open fun foo(/*0*/ p0: jet.String?, /*1*/ p1: jet.List<jet.Map.Entry<jet.String?, jet.String?>?>?): jet.String?
}
compiler/testData/loadJava/modality/ModalityOfFakeOverrides.java
+2
View File
@@ -1,9 +1,11 @@
package test;
import org.jetbrains.annotations.NotNull;
import java.util.AbstractList;
public class ModalityOfFakeOverrides extends AbstractList<String> {
@Override
@NotNull
public String get(int index) {
return "";
}
compiler/testData/loadJava/modality/ModalityOfFakeOverrides.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package test
import java.util.AbstractList
public open class ModalityOfFakeOverrides : AbstractList<String>() {
override fun get(p0: Int): String? {
override fun get(p0: Int): String {
return ""
}
compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt
+15 -15
View File
@@ -2,29 +2,29 @@ namespace test
public open class test.ModalityOfFakeOverrides : java.util.AbstractList<jet.String> {
public final /*constructor*/ fun <init>(): test.ModalityOfFakeOverrides
public open override /*1*/ fun add(/*0*/ p0: jet.Int, /*1*/ p1: jet.String?): jet.Tuple0
public open override /*1*/ fun add(/*0*/ p0: jet.String?): jet.Boolean
public open override /*1*/ fun addAll(/*0*/ p0: java.util.Collection<out jet.String>?): jet.Boolean
public open override /*1*/ fun addAll(/*0*/ p0: jet.Int, /*1*/ p1: java.util.Collection<out jet.String>?): jet.Boolean
public open override /*1*/ fun add(/*0*/ p0: jet.Int, /*1*/ p1: jet.String): jet.Tuple0
public open override /*1*/ fun add(/*0*/ p0: jet.String): jet.Boolean
public open override /*1*/ fun addAll(/*0*/ p0: jet.Collection<out jet.String>): jet.Boolean
public open override /*1*/ fun addAll(/*0*/ p0: jet.Int, /*1*/ p1: jet.Collection<out jet.String>): jet.Boolean
public open override /*1*/ fun clear(): jet.Tuple0
public open override /*1*/ fun contains(/*0*/ p0: jet.Any?): jet.Boolean
public open override /*1*/ fun containsAll(/*0*/ p0: java.util.Collection<out jet.Any?>?): jet.Boolean
public open override /*1*/ fun get(/*0*/ p0: jet.Int): jet.String?
public open override /*1*/ fun containsAll(/*0*/ p0: jet.Collection<out jet.Any?>): jet.Boolean
public open override /*1*/ fun get(/*0*/ p0: jet.Int): jet.String
public open override /*1*/ fun indexOf(/*0*/ p0: jet.Any?): jet.Int
public open override /*1*/ fun isEmpty(): jet.Boolean
public open override /*1*/ fun iterator(): jet.MutableIterator<jet.String>?
public open override /*1*/ fun iterator(): jet.MutableIterator<jet.String>
public open override /*1*/ fun lastIndexOf(/*0*/ p0: jet.Any?): jet.Int
public open override /*1*/ fun listIterator(): java.util.ListIterator<jet.String>?
public open override /*1*/ fun listIterator(/*0*/ p0: jet.Int): java.util.ListIterator<jet.String>?
public open override /*1*/ fun listIterator(): jet.MutableListIterator<jet.String>
public open override /*1*/ fun listIterator(/*0*/ p0: jet.Int): jet.MutableListIterator<jet.String>
protected final override /*1*/ var modCount: jet.Int
public open override /*1*/ fun remove(/*0*/ p0: jet.Any?): jet.Boolean
public open override /*1*/ fun remove(/*0*/ p0: jet.Int): jet.String?
public open override /*1*/ fun removeAll(/*0*/ p0: java.util.Collection<out jet.Any?>?): jet.Boolean
public open override /*1*/ fun removeAll(/*0*/ p0: jet.Collection<out jet.Any?>): jet.Boolean
protected open override /*1*/ fun removeRange(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.Tuple0
public open override /*1*/ fun retainAll(/*0*/ p0: java.util.Collection<out jet.Any?>?): jet.Boolean
public open override /*1*/ fun set(/*0*/ p0: jet.Int, /*1*/ p1: jet.String?): jet.String?
public open override /*1*/ fun retainAll(/*0*/ p0: jet.Collection<out jet.Any?>): jet.Boolean
public open override /*1*/ fun set(/*0*/ p0: jet.Int, /*1*/ p1: jet.String): jet.String
public open override /*1*/ fun size(): jet.Int
public open override /*1*/ fun subList(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): java.util.List<jet.String>?
public open override /*1*/ fun toArray(): jet.Array<jet.Any?>?
public open override /*1*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ p0: jet.Array<out T?>?): jet.Array<T?>?
public open override /*1*/ fun subList(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.MutableList<jet.String>
public open override /*1*/ fun toArray(): jet.Array<jet.Any?>
public open override /*1*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ p0: jet.Array<out T>): jet.Array<T>
}
compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.kt
-2
View File
@@ -1,5 +1,3 @@
package test
import java.util.Collection
class TestingKotlinCollections(val arguments: Collection<String>)
compiler/testData/loadKotlin/constructor/ConstructorCollectionParameter.txt
+2 -2
View File
@@ -1,6 +1,6 @@
namespace test
internal final class test.TestingKotlinCollections : jet.Any {
public final /*constructor*/ fun <init>(/*0*/ arguments: java.util.Collection<jet.String>): test.TestingKotlinCollections
internal final val arguments: java.util.Collection<jet.String>
public final /*constructor*/ fun <init>(/*0*/ arguments: jet.Collection<jet.String>): test.TestingKotlinCollections
internal final val arguments: jet.Collection<jet.String>
}
compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt
-3
View File
@@ -1,6 +1,3 @@
package test
import java.util.List
import java.lang.CharSequence
fun ff(p: List<CharSequence>) = 1
compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
internal final fun ff(/*0*/ p: java.util.List<java.lang.CharSequence>): jet.Int
internal final fun ff(/*0*/ p: jet.List<jet.CharSequence>): jet.Int
compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt
-1
View File
@@ -1,6 +1,5 @@
package test
import java.util.List
import java.lang.CharSequence
fun ff(p: List<CharSequence?>) = 1
compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
internal final fun ff(/*0*/ p: java.util.List<java.lang.CharSequence?>): jet.Int
internal final fun ff(/*0*/ p: jet.List<java.lang.CharSequence?>): jet.Int
compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt
-2
View File
@@ -1,7 +1,5 @@
package test
import java.util.List
import java.util.ArrayList
import java.lang.CharSequence
fun ffgg(): List<CharSequence> = ArrayList()
compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
internal final fun ffgg(): java.util.List<java.lang.CharSequence>
internal final fun ffgg(): jet.List<jet.CharSequence>
compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt
-2
View File
@@ -1,7 +1,5 @@
package test
import java.util.List
import java.util.ArrayList
import java.lang.CharSequence
fun ffgg(): List<CharSequence?> = ArrayList()
compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
internal final fun ffgg(): java.util.List<java.lang.CharSequence?>
internal final fun ffgg(): jet.List<jet.CharSequence?>
compiler/testData/loadKotlin/prop/CollectionSize.kt
-2
View File
@@ -1,6 +1,4 @@
package test
import java.util.Collection
val Collection<*>.anotherSize : Int
get() = size()
compiler/testData/loadKotlin/prop/CollectionSize.txt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
internal final val java.util.Collection<out jet.Any?>.anotherSize: jet.Int
internal final val jet.Collection<out jet.Any?>.anotherSize: jet.Int
compiler/testData/loadKotlin/prop/ExtVarMapPQInt.kt
-2
View File
@@ -1,7 +1,5 @@
package test
import java.util.Map
var <P, Q> Map<P, Q>.asas: Int
get() = throw Exception()
set(i: Int) = throw Exception()
compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
internal final var </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> java.util.Map<P, Q>.asas: jet.Int
internal final var </*0*/ P : jet.Any?, /*1*/ Q : jet.Any?> jet.Map<P, Q>.asas: jet.Int
compiler/testData/loadKotlin/type/ListOfAny.kt
-2
View File
@@ -1,5 +1,3 @@
package test
import java.util.List
fun listOfAny(): List<Any> = throw Exception()
compiler/testData/loadKotlin/type/ListOfAny.txt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
internal final fun listOfAny(): java.util.List<jet.Any>
internal final fun listOfAny(): jet.List<jet.Any>
compiler/testData/loadKotlin/type/ListOfAnyQ.kt
-2
View File
@@ -1,5 +1,3 @@
package test
import java.util.List
fun listOfAnyQ(): List<Any?> = throw Exception()
compiler/testData/loadKotlin/type/ListOfAnyQ.txt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
internal final fun listOfAnyQ(): java.util.List<jet.Any?>
internal final fun listOfAnyQ(): jet.List<jet.Any?>
compiler/testData/loadKotlin/type/ListOfStar.kt
-2
View File
@@ -1,5 +1,3 @@
package test
import java.util.List
fun listOfStar(): List<*> = throw Exception()
compiler/testData/loadKotlin/type/ListOfStar.txt
+1 -1
View File
@@ -1,3 +1,3 @@
namespace test
internal final fun listOfStar(): java.util.List<out jet.Any?>
internal final fun listOfStar(): jet.List<out jet.Any?>
compiler/testData/resolve/ResolveOfInfixExpressions.jet
+6 -6
View File
@@ -57,18 +57,18 @@ fun f_plus(): Int {
}
fun <T> tt(t : T) : T {
val x : List<Int> = 0
x`java::java.util.List.get()`[1]
val x : ArrayList<Int> = 0
x`java::java.util.ArrayList.get()`[1]
val foo = `Bar`Bar()
foo`!!`[null, 1]
foo`get2`[1, 1]
foo`get1`[1]
foo`set1`[1] = ""
foo`set1`[1, 2] = ""
x`java::java.util.List.set()`[1] = null
(x`java::java.util.List.set()`[1]) = null
x`java::java.util.List.set()`[null] = null
(x`java::java.util.List.set()`[null, 2]) = null
x`java::java.util.ArrayList.set()`[1] = null
(x`java::java.util.ArrayList.set()`[1]) = null
x`java::java.util.ArrayList.set()`[null] = null
(x`java::java.util.ArrayList.set()`[null, 2]) = null
(`not`!foo)[1]`:kotlin::Char`
val y = Bar()
y`inc`++
compiler/testData/resolve/ResolveToJava.jet
+6 -6
View File
@@ -1,23 +1,23 @@
import `java::java`java.*
import java.`java::java.util`util.*
fun foo(~a~a : `kotlin::Array`Array<`kotlin::Int`Int>) : `java::java.util.List`List {
fun foo(~a~a : `kotlin::Array`Array<`kotlin::Int`Int>) : `java::java.util.ArrayList`ArrayList {
`a`a.`kotlin::Array.get(Int)`get(1)
`a`a.`kotlin::Array.set(Int, Int)`set(1, 1)
}
fun foo(o : `java::java.lang.Object`Object, l : `java::java.util`util.`java::java.util.List`List) : `java::java.util.List`List {}
fun foo(o : `java::java.lang.Object`Object, l : `java::java.util`util.`java::java.util.ArrayList`ArrayList) : `java::java.util.ArrayList`ArrayList {}
~A~class A() {
fun f(a : `java::java.util`util.`java::java.util.List`List) {}
fun f(a : `java::java.util.List`List) {}
fun f(a : `java::java.util`util.`java::java.util.ArrayList`ArrayList) {}
fun f(a : `java::java.util.ArrayList`ArrayList) {}
}
class B : `java::java.lang.Object`Object {
fun f(a : `java::java.util`util.`java::java.util.List`List) {}
fun f(a : `java::java.util.List`List) {}
fun f(a : `java::java.util`util.`java::java.util.ArrayList`ArrayList) {}
fun f(a : `java::java.util.ArrayList`ArrayList) {}
~foo~fun foo(abc : `A`A) : `A`A {
compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+1 -1
View File
@@ -491,7 +491,7 @@ public class NamespaceGenTest extends CodegenTestCase {
}
public void testJavaInterfaceMethod() throws Exception {
loadText("import java.util.*; fun foo(l: List<String>) { l.add(\"foo\") }");
loadText("import java.util.*; fun foo(l: ArrayList<String>) { l.add(\"foo\") }");
final Method main = generateFunction();
final ArrayList<String> list = new ArrayList<String>();
main.invoke(null, list);
compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java
+4 -4
View File
@@ -82,10 +82,10 @@ public class JetResolveTest extends ExtensibleResolveTestCase {
PsiClass java_util_Collections = findClass("java.util.Collections");
nameToDeclaration.put("java::java.util.Collections.emptyList()", findMethod(java_util_Collections, "emptyList"));
nameToDeclaration.put("java::java.util.Collections", java_util_Collections);
PsiClass java_util_List = findClass("java.util.List");
nameToDeclaration.put("java::java.util.List", java_util_List);
nameToDeclaration.put("java::java.util.List.set()", java_util_List.findMethodsByName("set", true)[0]);
nameToDeclaration.put("java::java.util.List.get()", java_util_List.findMethodsByName("get", true)[0]);
PsiClass java_util_List = findClass("java.util.ArrayList");
nameToDeclaration.put("java::java.util.ArrayList", java_util_List);
nameToDeclaration.put("java::java.util.ArrayList.set()", java_util_List.findMethodsByName("set", true)[0]);
nameToDeclaration.put("java::java.util.ArrayList.get()", java_util_List.findMethodsByName("get", true)[0]);
nameToDeclaration.put("java::java", findPackage("java"));
nameToDeclaration.put("java::java.util", findPackage("java.util"));
nameToDeclaration.put("java::java.lang", findPackage("java.lang"));
idea/testData/checker/Builders.jet
+1 -1
View File
@@ -78,7 +78,7 @@ import java.util.*
}
}
fun Map<String, String>.set(key : String, value : String) = this.put(key, value)
fun MutableMap<String, String>.set(key : String, value : String) = this.put(key, value)
fun html(init : HTML.() -> Unit) : HTML {
val html = HTML()
idea/testData/checker/ResolveToJava.jet
+3 -3
View File
@@ -7,11 +7,11 @@ import <warning>java.lang.Comparable</warning> as Com
val l : List<in Int> = ArrayList<Int>()
fun test(<warning>l</warning> : java.util.List<Int>) {
fun test(<warning>l</warning> : List<Int>) {
val <warning>x</warning> : java.<error>List</error>
val <warning>y</warning> : java.util.List<Int>
val <warning>y</warning> : List<Int>
val <warning>b</warning> : <warning>java.lang.Object</warning>
val <warning>a</warning> : util.List<Int>
val <warning>a</warning> : <warning>util.List<Int></warning>
val <warning>z</warning> : java.<error>utils</error>.<error>List</error><Int>
val <warning>f</warning> : java.io.File? = null
idea/testData/checker/regression/Jet53.jet
-1
View File
@@ -1,4 +1,3 @@
import java.util.Collections
import java.util.List
val ab = Collections.emptyList<Int>() : List<Int>?
idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt
+1 -1
View File
@@ -1,5 +1,5 @@
trait Trait {
fun <A, B : Runnable, E : java.util.Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B>;
fun <A, B : Runnable, E : Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B>;
}
class TraitImpl : Trait {
idea/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
BIN
View File
Binary file not shown.
idea/testData/intentions/specifyType/afterClassNameClashing.kt
+1 -3
View File
@@ -1,7 +1,5 @@
// "Specify Type Explicitly" "true"
import java.util.Map
fun getEntry() : java.util.Map.Entry<jet.Array<String>, java.sql.Array> {
fun getEntry() : Map.Entry<jet.Array<String>, java.sql.Array> {
}
val x: Map.Entry<Array<String>, java.sql.Array> = getEntry()
idea/testData/intentions/specifyType/afterLoopParameter.kt
-1
View File
@@ -1,6 +1,5 @@
// "Specify Type Explicitly" "true"
import java.util.HashMap
import java.util.Map
fun foo(map : HashMap<String, Int>) {
for (<caret>entry : Map.Entry<String, Int> in map.entrySet()) {
idea/testData/intentions/specifyType/afterOnType.kt
-1
View File
@@ -1,4 +1,3 @@
// "Remove Explicitly Specified Type" "true"
import java.util.Map
val x = null
idea/testData/intentions/specifyType/beforeClassNameClashing.kt
+1 -1
View File
@@ -1,5 +1,5 @@
// "Specify Type Explicitly" "true"
fun getEntry() : java.util.Map.Entry<jet.Array<String>, java.sql.Array> {
fun getEntry() : Map.Entry<jet.Array<String>, java.sql.Array> {
}
val <caret>x = getEntry()
idea/testData/intentions/specifyType/beforeOnType.kt
-1
View File
@@ -1,4 +1,3 @@
// "Remove Explicitly Specified Type" "true"
import java.util.Map
val x : Map.Entry<Stri<caret>ng, Int>? = null
idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnType.kt
+1 -3
View File
@@ -1,6 +1,4 @@
// "Specify type explicitly" "true"
package a
import java.util.List
public val <caret>l: List<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>: List<Int>?
val l<caret>: MutableList<Int>?
}
}
}
idea/testData/quickfix/typeImports/afterToImport1.kt
+1 -2
View File
@@ -2,10 +2,9 @@
package a
import java.util.Collections
import java.util.List
class M {
trait A {
abstract val l<caret>: List<Int>?
abstract val l<caret>: MutableList<Int>?
}
}