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

Remove OI/NI attributes from test data

Browse Source
This commit is contained in:
Denis.Zharkov
2021-05-24 12:42:39 +03:00
committed by teamcityserver
parent 2ecba6ac39
commit ddbdfafa79
441 changed files with 1005 additions and 1037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.kt
Vendored
+4 -4
View File
@@ -31,13 +31,13 @@ fun getArr(): Array<String>? = null
fun f() {
A().foo(1, <!SPREAD_OF_NULLABLE!>*<!>args)
bar(2, <!SPREAD_OF_NULLABLE!>*<!><!TYPE_MISMATCH!>args<!>)
baz(<!NON_VARARG_SPREAD, SPREAD_OF_NULLABLE!>*<!><!TYPE_MISMATCH{NI}!>args<!>)
baz(<!NON_VARARG_SPREAD, SPREAD_OF_NULLABLE!>*<!><!TYPE_MISMATCH!>args<!>)
}
fun g(args: Array<String>?) {
if (args != null) {
A().foo(1, *<!DEBUG_INFO_SMARTCAST{OI}!>args<!>)
A().foo(1, *args)
}
A().foo(1, *A.ar)
}
@@ -48,14 +48,14 @@ class B {
fun h(b: B) {
if (b.args != null) {
A().foo(1, <!SPREAD_OF_NULLABLE!>*<!><!SMARTCAST_IMPOSSIBLE{OI}!>b.args<!>)
A().foo(1, <!SPREAD_OF_NULLABLE!>*<!>b.args)
}
}
fun k() {
A().foo(1, <!SPREAD_OF_NULLABLE!>*<!>getArr())
bar(2, <!SPREAD_OF_NULLABLE!>*<!><!TYPE_MISMATCH!>getArr()<!>)
baz(<!NON_VARARG_SPREAD, SPREAD_OF_NULLABLE!>*<!><!TYPE_MISMATCH{NI}!>getArr()<!>)
baz(<!NON_VARARG_SPREAD, SPREAD_OF_NULLABLE!>*<!><!TYPE_MISMATCH!>getArr()<!>)
}
fun invokeTest(goodArgs: Array<String>) {
compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt
Vendored
+1 -1
View File
@@ -19,7 +19,7 @@ fun test_fun(s: String, arr: Array<String>) {
}
fun test_ann(s: String, arr: Array<String>) {
@Ann(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH, TYPE_MISMATCH!>[""]<!>, x = 1)
@Ann(<!TYPE_MISMATCH, TYPE_MISMATCH!>[""]<!>, x = 1)
foo()
@Ann(*[""], x = 1)
foo()
compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.kt
Vendored
+1 -1
View File
@@ -19,7 +19,7 @@ fun test_fun(s: String, arr: Array<String>) {
}
fun test_ann(s: String, arr: Array<String>) {
@Ann(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH, TYPE_MISMATCH!>[""]<!>, x = 1)
@Ann(<!TYPE_MISMATCH, TYPE_MISMATCH!>[""]<!>, x = 1)
foo()
@Ann(*[""], x = 1)
foo()
compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ fun test1() {}
@Ann(s = <!TYPE_MISMATCH!>intArrayOf()<!>)
fun test2() {}
@Ann(s = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>arrayOf(1)<!>)
@Ann(s = <!TYPE_MISMATCH!>arrayOf(1)<!>)
fun test3() {}
@Ann("value1", "value2")
compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.kt
Vendored
+2 -2
View File
@@ -52,8 +52,8 @@ fun testMany(a: Any) {
manyFoo(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>""<!>)
<!NONE_APPLICABLE!>manyFoo<!>(a)
<!NONE_APPLICABLE{NI}!>manyFoo<!>(<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>v<!> = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR{OI}, TYPE_MISMATCH{OI}!>a<!>)
<!NONE_APPLICABLE{NI}!>manyFoo<!>(<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>s<!> = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR{OI}, TYPE_MISMATCH{OI}!>a<!>)
<!NONE_APPLICABLE!>manyFoo<!>(<!DEBUG_INFO_MISSING_UNRESOLVED!>v<!> = a)
<!NONE_APPLICABLE!>manyFoo<!>(<!DEBUG_INFO_MISSING_UNRESOLVED!>s<!> = a)
manyFoo(v = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>a as Int<!>)
manyFoo(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>a as String<!>)
}
compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.kt
Vendored
+2 -2
View File
@@ -52,8 +52,8 @@ fun testMany(a: Any) {
manyFoo(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>""<!>)
<!NONE_APPLICABLE!>manyFoo<!>(a)
<!NONE_APPLICABLE{NI}!>manyFoo<!>(<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>v<!> = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION{OI}, TYPE_MISMATCH{OI}!>a<!>)
<!NONE_APPLICABLE{NI}!>manyFoo<!>(<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>s<!> = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION{OI}, TYPE_MISMATCH{OI}!>a<!>)
<!NONE_APPLICABLE!>manyFoo<!>(<!DEBUG_INFO_MISSING_UNRESOLVED!>v<!> = a)
<!NONE_APPLICABLE!>manyFoo<!>(<!DEBUG_INFO_MISSING_UNRESOLVED!>s<!> = a)
manyFoo(v = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>a as Int<!>)
manyFoo(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>a as String<!>)
}
compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.kt
Vendored
+7 -7
View File
@@ -11,30 +11,30 @@
annotation class Ann(vararg val s: String)
@Ann(s = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>arrayOf()<!>)
@Ann(s = <!TYPE_MISMATCH!>arrayOf()<!>)
fun test1() {}
@Ann(s = <!TYPE_MISMATCH!>intArrayOf()<!>)
fun test2() {}
@Ann(s = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>arrayOf(1)<!>)
@Ann(s = <!TYPE_MISMATCH!>arrayOf(1)<!>)
fun test3() {}
@Ann(s = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH, TYPE_MISMATCH!>["value"]<!>)
@Ann(s = <!TYPE_MISMATCH, TYPE_MISMATCH!>["value"]<!>)
fun test5() {}
@JavaAnn(value = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>arrayOf("value")<!>)
@JavaAnn(value = <!TYPE_MISMATCH!>arrayOf("value")<!>)
fun jTest1() {}
@JavaAnn(value = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH, TYPE_MISMATCH!>["value"]<!>)
@JavaAnn(value = <!TYPE_MISMATCH, TYPE_MISMATCH!>["value"]<!>)
fun jTest2() {}
@JavaAnn(value = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH, TYPE_MISMATCH!>["value"]<!>, path = ["path"])
@JavaAnn(value = <!TYPE_MISMATCH, TYPE_MISMATCH!>["value"]<!>, path = ["path"])
fun jTest3() {}
annotation class IntAnn(vararg val i: Int)
@IntAnn(i = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH, TYPE_MISMATCH!>[1, 2]<!>)
@IntAnn(i = <!TYPE_MISMATCH, TYPE_MISMATCH!>[1, 2]<!>)
fun foo1() {}
@IntAnn(i = <!TYPE_MISMATCH!>intArrayOf(0)<!>)