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/generics/nullability/expressionsBoundsViolation.kt
Vendored
+3 -4
View File
@@ -6,13 +6,12 @@ fun <E : CharSequence> foo1(x: E) {}
fun <E : CharSequence> E.foo2() {}
fun <F : String?> bar(x: F) {
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>A<!>(<!TYPE_MISMATCH{NI}!>x<!>)
A(<!TYPE_MISMATCH!>x<!>)
A<<!UPPER_BOUND_VIOLATED!>F<!>>(x)
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>foo1<!>(<!TYPE_MISMATCH{NI}!>x<!>)
foo1(<!TYPE_MISMATCH!>x<!>)
foo1<<!UPPER_BOUND_VIOLATED!>F<!>>(x)
x<!UNSAFE_CALL{NI}!>.<!><!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>foo2<!>()
x<!UNSAFE_CALL!>.<!>foo2()
x.foo2<<!UPPER_BOUND_VIOLATED!>F<!>>()
}
compiler/testData/diagnostics/tests/generics/nullability/smartCasts.kt
Vendored
+4 -4
View File
@@ -14,9 +14,9 @@ fun <T : CharSequence?> foo(x: T) {
<!DEBUG_INFO_SMARTCAST!>x<!>.length
x<!UNNECESSARY_SAFE_CALL!>?.<!>length
<!DEBUG_INFO_SMARTCAST{NI}!>x<!>.bar1()
<!DEBUG_INFO_SMARTCAST!>x<!>.bar1()
x.bar2()
<!DEBUG_INFO_SMARTCAST{NI}!>x<!>.<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar3<!>()
<!DEBUG_INFO_SMARTCAST!>x<!>.bar3()
<!DEBUG_INFO_SMARTCAST!>x<!>.bar4()
@@ -29,7 +29,7 @@ fun <T : CharSequence?> foo(x: T) {
<!DEBUG_INFO_SMARTCAST!>x<!>.length
x<!UNNECESSARY_SAFE_CALL!>?.<!>length
<!DEBUG_INFO_SMARTCAST{NI}!>x<!>.bar1()
<!DEBUG_INFO_SMARTCAST!>x<!>.bar1()
x.bar2()
<!DEBUG_INFO_SMARTCAST!>x<!>.bar3()
}
@@ -38,7 +38,7 @@ fun <T : CharSequence?> foo(x: T) {
<!DEBUG_INFO_SMARTCAST!>x<!>.length
x<!UNNECESSARY_SAFE_CALL!>?.<!>length
<!DEBUG_INFO_SMARTCAST{NI}!>x<!>.bar1()
<!DEBUG_INFO_SMARTCAST!>x<!>.bar1()
x.bar2()
<!DEBUG_INFO_SMARTCAST!>x<!>.bar3()
}
compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.kt
Vendored
+6 -6
View File
@@ -10,13 +10,13 @@ fun <T : String?> T.foo() {
if (this != null) {
if (<!SENSELESS_COMPARISON!>this != null<!>) {}
<!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST{NI}!>length<!>
<!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>length<!>
this<!UNNECESSARY_SAFE_CALL!>?.<!>length
<!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST{NI}!>bar1<!>()
<!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>bar1<!>()
bar2()
<!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST{NI}, TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar3<!>()
<!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST{NI}!>bar4<!>()
<!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>bar3<!>()
<!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>bar4<!>()
this<!UNNECESSARY_SAFE_CALL!>?.<!>bar1()
@@ -28,8 +28,8 @@ fun <T : String?> T.foo() {
<!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>length<!>
this<!UNNECESSARY_SAFE_CALL!>?.<!>length
<!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST{NI}!>bar1<!>()
<!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>bar1<!>()
bar2()
<!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST{NI}, TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar3<!>()
<!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>bar3<!>()
}
}
compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.kt
Vendored
+4 -4
View File
@@ -13,7 +13,7 @@ fun <T : CharSequence?> foo(x: T) {
y1 = <!DEBUG_INFO_SMARTCAST!>x<!>
y2 = <!TYPE_MISMATCH!>x<!>
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar1<!>(<!DEBUG_INFO_SMARTCAST{NI}!>x<!>)
bar1(<!DEBUG_INFO_SMARTCAST!>x<!>)
bar1<CharSequence>(<!DEBUG_INFO_SMARTCAST!>x<!>)
bar2(<!DEBUG_INFO_SMARTCAST!>x<!>)
bar3(<!TYPE_MISMATCH!>x<!>)
@@ -39,13 +39,13 @@ fun <T : CharSequence?> foo(x: T) {
if (1 == 1) {
val y = x!!
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar1<!>(<!DEBUG_INFO_SMARTCAST{NI}!>x<!>)
bar1(<!DEBUG_INFO_SMARTCAST!>x<!>)
bar1<CharSequence>(<!DEBUG_INFO_SMARTCAST!>x<!>)
bar2(<!DEBUG_INFO_SMARTCAST!>x<!>)
bar3(<!TYPE_MISMATCH!>x<!>)
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar1<!>(y)
bar2(<!DEBUG_INFO_SMARTCAST{OI}!>y<!>)
bar1(y)
bar2(y)
bar3(<!TYPE_MISMATCH!>y<!>)
}
}
compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.kt
Vendored
+2 -2
View File
@@ -17,7 +17,7 @@ class A<F> {
x2.checkType { _<F>() }
foo1<<!UPPER_BOUND_VIOLATED!>F?<!>>(y)
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>foo1<!>(<!TYPE_MISMATCH{NI}!>y<!>)
foo1(<!TYPE_MISMATCH!>y<!>)
foo2<F?>(y)
val x3 = foo2(y)
@@ -37,7 +37,7 @@ class A<F> {
x4.checkType { _<Z>() }
foo1<<!UPPER_BOUND_VIOLATED!>W<!>>(w)
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>foo1<!>(<!TYPE_MISMATCH{NI}!>w<!>)
foo1(<!TYPE_MISMATCH!>w<!>)
foo2<W>(w)
val x6 = foo2(w)
compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.kt
Vendored
+10 -10
View File
@@ -19,7 +19,7 @@ class A<F> {
fooInv1<Inv<F>>(Inv<F>())
fooInv2<<!UPPER_BOUND_VIOLATED!>Inv<F><!>>(Inv<F>())
fooInv1(Inv<F>())
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooInv2<!>(<!TYPE_MISMATCH{NI}!>Inv<F>()<!>)
fooInv2(<!TYPE_MISMATCH!>Inv<F>()<!>)
fooIn1<In<F?>>(In<F?>())
fooIn2<In<F?>>(In<F?>())
@@ -34,13 +34,13 @@ class A<F> {
// Z
fooInv1<<!UPPER_BOUND_VIOLATED!>Inv<Z><!>>(Inv<Z>())
fooInv2<<!UPPER_BOUND_VIOLATED!>Inv<Z><!>>(Inv<Z>())
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooInv1<!>(<!TYPE_MISMATCH{NI}!>Inv<Z>()<!>)
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooInv2<!>(<!TYPE_MISMATCH{NI}!>Inv<Z>()<!>)
fooInv1(<!TYPE_MISMATCH!>Inv<Z>()<!>)
fooInv2(<!TYPE_MISMATCH!>Inv<Z>()<!>)
fooIn1<<!UPPER_BOUND_VIOLATED!>In<Z?><!>>(In<Z?>())
fooIn2<<!UPPER_BOUND_VIOLATED!>In<Z?><!>>(In<Z?>())
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooIn1<!>(<!TYPE_MISMATCH{NI}!>In<Z?>()<!>)
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooIn2<!>(<!TYPE_MISMATCH{NI}!>In<Z?>()<!>)
fooIn1(<!TYPE_MISMATCH!>In<Z?>()<!>)
fooIn2(<!TYPE_MISMATCH!>In<Z?>()<!>)
fooOut1<Out<Z>>(Out<Z>())
fooOut2<Out<Z>>(Out<Z>())
@@ -50,17 +50,17 @@ class A<F> {
// W
fooInv1<<!UPPER_BOUND_VIOLATED!>Inv<W><!>>(Inv<W>())
fooInv2<<!UPPER_BOUND_VIOLATED!>Inv<W><!>>(Inv<W>())
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooInv1<!>(<!TYPE_MISMATCH{NI}!>Inv<W>()<!>)
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooInv2<!>(<!TYPE_MISMATCH{NI}!>Inv<W>()<!>)
fooInv1(<!TYPE_MISMATCH!>Inv<W>()<!>)
fooInv2(<!TYPE_MISMATCH!>Inv<W>()<!>)
fooIn1<<!UPPER_BOUND_VIOLATED!>In<W?><!>>(In<W?>())
fooIn2<<!UPPER_BOUND_VIOLATED!>In<W?><!>>(In<W?>())
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooIn1<!>(<!TYPE_MISMATCH{NI}!>In<W?>()<!>)
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooIn2<!>(<!TYPE_MISMATCH{NI}!>In<W?>()<!>)
fooIn1(<!TYPE_MISMATCH!>In<W?>()<!>)
fooIn2(<!TYPE_MISMATCH!>In<W?>()<!>)
fooOut1<<!UPPER_BOUND_VIOLATED!>Out<W><!>>(Out<W>())
fooOut2<Out<W>>(Out<W>())
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooOut1<!>(<!TYPE_MISMATCH{NI}!>Out<W>()<!>)
fooOut1(<!TYPE_MISMATCH!>Out<W>()<!>)
fooOut2(Out<W>())
}
}
compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.kt
Vendored
+2 -2
View File
@@ -20,7 +20,7 @@ fun <T : String?> foo(x: T) {
x?.bar1()
x?.bar2()
x<!UNSAFE_CALL{NI}!>.<!><!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar3<!>()
x<!UNSAFE_CALL!>.<!>bar3()
x?.let { it<!UNSAFE_CALL{OI}!>.<!>length }
x?.let { it.length }
}
compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.kt
Vendored
+1 -1
View File
@@ -12,6 +12,6 @@ fun <T : String?> foo(x: T) {
bar1(x)
bar2(x)
<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar3<!>(<!TYPE_MISMATCH{NI}!>x<!>)
bar3(<!TYPE_MISMATCH!>x<!>)
bar4(<!TYPE_MISMATCH!>x<!>)
}