[FIR] Fix tests (ARGUMENT_TYPE_MISMATCH instead of INCOMPATIBLE_CANDIDATE)
This commit is contained in:
committed by
TeamCityServer
parent
4ffab5fe5a
commit
ad9b962536
Vendored
+1
-1
@@ -23,7 +23,7 @@ fun foo(k: KotlinClass) {
|
||||
|
||||
k.setSomething4("")
|
||||
k.something4 += ""
|
||||
k.<!INAPPLICABLE_CANDIDATE!>setSomething4<!>(null)
|
||||
k.setSomething4(<!ARGUMENT_TYPE_MISMATCH!>null<!>)
|
||||
k.something4 = null
|
||||
|
||||
useString(k.getSomething5())
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
// JAVAC_EXPECTED_FILE
|
||||
// FILE: KotlinFile.kt
|
||||
fun foo(javaClass: JavaClass<String>): String {
|
||||
return javaClass.<!INAPPLICABLE_CANDIDATE!>doSomething<!>("", 1) { s: String -> "" }
|
||||
return javaClass.doSomething("", 1) { s: String -> <!ARGUMENT_TYPE_MISMATCH!>""<!> }
|
||||
}
|
||||
|
||||
// FILE: JavaClass.java
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
// JAVAC_EXPECTED_FILE
|
||||
// FILE: KotlinFile.kt
|
||||
fun foo(javaClass: JavaClass): String {
|
||||
return javaClass.<!INAPPLICABLE_CANDIDATE!>doSomething<!>("") { <!UNRESOLVED_REFERENCE!>it<!> }
|
||||
return javaClass.doSomething("") { <!ARGUMENT_TYPE_MISMATCH, UNRESOLVED_REFERENCE!>it<!> }
|
||||
}
|
||||
|
||||
// FILE: JavaClass.java
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
// JAVAC_EXPECTED_FILE
|
||||
// FILE: KotlinFile.kt
|
||||
fun foo(javaClass: JavaClass<Int>) {
|
||||
val a: String = javaClass.<!INAPPLICABLE_CANDIDATE!>doSomething1<!>("", 1) { p: String -> p }
|
||||
val b: String = javaClass.<!INAPPLICABLE_CANDIDATE!>doSomething2<!>("", 1, true) { p: Int -> p }
|
||||
val a: String = javaClass.doSomething1("", 1) { p: String -> <!ARGUMENT_TYPE_MISMATCH!>p<!> }
|
||||
val b: String = javaClass.doSomething2("", 1, true) { p: Int -> <!ARGUMENT_TYPE_MISMATCH!>p<!> }
|
||||
}
|
||||
|
||||
// FILE: JavaClass.java
|
||||
|
||||
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
||||
// FILE: KotlinFile.kt
|
||||
fun foo(javaClass: JavaClass<Int>): Int {
|
||||
val inner = javaClass.createInner<String>()
|
||||
return inner.<!INAPPLICABLE_CANDIDATE!>doSomething<!>(1, "") { }
|
||||
return inner.doSomething(<!ARGUMENT_TYPE_MISMATCH!>1<!>, "") { }
|
||||
}
|
||||
|
||||
// FILE: JavaClass.java
|
||||
|
||||
Vendored
+2
-2
@@ -1,8 +1,8 @@
|
||||
// !WITH_NEW_INFERENCE
|
||||
// FILE: KotlinFile.kt
|
||||
fun foo(javaInterface: JavaInterface) {
|
||||
javaInterface.<!INAPPLICABLE_CANDIDATE!>doIt<!>(null) { }
|
||||
javaInterface.<!INAPPLICABLE_CANDIDATE!>doIt<!>("", null)
|
||||
javaInterface.doIt(<!ARGUMENT_TYPE_MISMATCH!>null<!>) { }
|
||||
javaInterface.doIt("", <!ARGUMENT_TYPE_MISMATCH!>null<!>)
|
||||
}
|
||||
|
||||
// FILE: JavaInterface.java
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@ fun foo(javaClass: JavaClass, kotlinClass: KotlinClass) {
|
||||
bar()
|
||||
}
|
||||
|
||||
javaClass.<!INAPPLICABLE_CANDIDATE!>doSomething2<!> {
|
||||
bar()
|
||||
javaClass.doSomething2 {
|
||||
<!ARGUMENT_TYPE_MISMATCH!>bar()<!>
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user