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

Switch kotlin version to 1.7

Browse Source 
* Change 1.6 to 1.7 constants
* Fix SAFE_CALL_WILL_CHANGE_NULLABILITY for testData
* Change EXPOSED_PROPERTY_TYPE_IN_CONSTRUCTOR_WARNING to EXPOSED_PROPERTY_TYPE_IN_CONSTRUCTOR_ERROR
* Change NON_EXHAUSTIVE_WHEN_STATEMENT to NO_ELSE_IN_WHEN
* Fix testData for SafeCallsAreAlwaysNullable
* Change T -> T & Any in test dumps
* Change INVALID_CHARACTERS_NATIVE_WARNING -> INVALID_CHARACTERS_NATIVE_ERROR
* TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM_WARNING -> TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM_ERROR
This commit is contained in:
Mikhail Glukhikh
2021-12-23 17:55:36 +03:00
committed by Space
parent d741aaf82f
commit 53d6ac24e5
269 changed files with 624 additions and 1132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/when/ExhaustiveValOverConditionalInit.fir.kt
Vendored
+1 -1
View File
@@ -28,7 +28,7 @@ fun bar(a: Boolean, b: Boolean): Int {
if (a) {
x = 1
}
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!> (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
false -> <!VAL_REASSIGNMENT!>x<!> = 3
}
return <!UNINITIALIZED_VARIABLE!>x<!>
compiler/testData/diagnostics/tests/when/ExhaustiveValOverConditionalInit.kt
Vendored
+1 -1
View File
@@ -28,7 +28,7 @@ fun bar(a: Boolean, b: Boolean): Int {
if (a) {
x = 1
}
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!> (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
false -> <!VAL_REASSIGNMENT!>x<!> = 3
}
return <!UNINITIALIZED_VARIABLE!>x<!>
compiler/testData/diagnostics/tests/when/ExhaustiveVarOverConditionalInit.fir.kt
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@ fun bar(a: Boolean, b: Boolean): Int {
if (a) {
x = 1
}
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!> (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
false -> x = 3
}
return <!UNINITIALIZED_VARIABLE!>x<!>
compiler/testData/diagnostics/tests/when/ExhaustiveVarOverConditionalInit.kt
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@ fun bar(a: Boolean, b: Boolean): Int {
if (a) {
x = 1
}
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!> (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
false -> x = 3
}
return <!UNINITIALIZED_VARIABLE!>x<!>
compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.kt
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ enum class X { A, B, C, D }
fun foo(arg: X): String {
var res = "XXX"
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!> (arg) {
<!NO_ELSE_IN_WHEN!>when<!> (arg) {
X.A -> res = "A"
X.B -> res = "B"
}
compiler/testData/diagnostics/tests/when/NonExhaustiveWarningForSealedClass.fir.kt
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@ object Last : S()
fun use(s: String) = s
fun foo(s: S) {
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!> (s) {
<!NO_ELSE_IN_WHEN!>when<!> (s) {
First -> {}
is Derived -> use(s.s)
}
compiler/testData/diagnostics/tests/when/NonExhaustiveWarningForSealedClass.kt
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@ object Last : S()
fun use(s: String) = s
fun foo(s: S) {
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!> (s) {
<!NO_ELSE_IN_WHEN!>when<!> (s) {
First -> {}
is Derived -> use(<!DEBUG_INFO_SMARTCAST!>s<!>.s)
}
compiler/testData/diagnostics/tests/when/NonExhaustiveWarningNull.kt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ enum class X { A, B, C, D }
fun foo(arg: X?): String {
var res = "XXX"
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!> (arg) {
<!NO_ELSE_IN_WHEN!>when<!> (arg) {
X.A -> res = "A"
X.B -> res = "B"
X.C -> res = "C"
compiler/testData/diagnostics/tests/when/deprecatedSyntaxInConditionsNoSubject.fir.kt
Vendored
+1 -1
View File
@@ -54,7 +54,7 @@ fun testWithSubject_ok(x: Boolean, y: Boolean?, any: Any, z: Boolean) {
}
var b = z
when (z) {
<!NO_ELSE_IN_WHEN!>when<!> (z) {
b++ -> {}
b-- -> {}
}
compiler/testData/diagnostics/tests/when/deprecatedSyntaxInConditionsNoSubject.kt
Vendored
+1 -1
View File
@@ -54,7 +54,7 @@ fun testWithSubject_ok(x: Boolean, y: Boolean?, any: Any, z: Boolean) {
}
var b = z
when (z) {
<!NO_ELSE_IN_WHEN!>when<!> (z) {
b++ -> {}
b-- -> {}
}
compiler/testData/diagnostics/tests/when/deprecatedSyntaxInConditions_after.fir.kt
Vendored
+4 -4
View File
@@ -87,12 +87,12 @@ fun testWithSubject_bad_1(x: A) {
fun testWithSubject_bad_2(b: Boolean) {
// bad
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
<!CONFUSING_BRANCH_CONDITION_ERROR!>b && b<!> -> {}
<!CONFUSING_BRANCH_CONDITION_ERROR!>b || b<!> -> {}
}
// ok
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
(b && b) -> {}
(b || b) -> {}
}
@@ -191,12 +191,12 @@ fun testWithRange_bad_1(x: A) {
fun testWithRange_bad_2(b: Boolean) {
// bad
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
in <!CONFUSING_BRANCH_CONDITION_ERROR!>b && b<!> -> {}
in <!CONFUSING_BRANCH_CONDITION_ERROR!>b || b<!> -> {}
}
// ok
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
in (b && b) -> {}
in (b || b) -> {}
}
compiler/testData/diagnostics/tests/when/deprecatedSyntaxInConditions_after.kt
Vendored
+4 -4
View File
@@ -87,12 +87,12 @@ fun testWithSubject_bad_1(x: A) {
fun testWithSubject_bad_2(b: Boolean) {
// bad
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
<!CONFUSING_BRANCH_CONDITION_ERROR!>b && b<!> -> {}
<!CONFUSING_BRANCH_CONDITION_ERROR!>b || b<!> -> {}
}
// ok
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
(b && b) -> {}
(b || b) -> {}
}
@@ -191,12 +191,12 @@ fun testWithRange_bad_1(x: A) {
fun testWithRange_bad_2(b: Boolean) {
// bad
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
in <!CONFUSING_BRANCH_CONDITION_ERROR!>b && b<!> -> {}
in <!CONFUSING_BRANCH_CONDITION_ERROR!>b || b<!> -> {}
}
// ok
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
in (b && b) -> {}
in (b || b) -> {}
}
compiler/testData/diagnostics/tests/when/deprecatedSyntaxInConditions_before.fir.kt
Vendored
+4 -4
View File
@@ -87,12 +87,12 @@ fun testWithSubject_bad_1(x: A) {
fun testWithSubject_bad_2(b: Boolean) {
// bad
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
<!CONFUSING_BRANCH_CONDITION_WARNING!>b && b<!> -> {}
<!CONFUSING_BRANCH_CONDITION_WARNING!>b || b<!> -> {}
}
// ok
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
(b && b) -> {}
(b || b) -> {}
}
@@ -191,12 +191,12 @@ fun testWithRange_bad_1(x: A) {
fun testWithRange_bad_2(b: Boolean) {
// bad
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
in <!CONFUSING_BRANCH_CONDITION_WARNING!>b && b<!> -> {}
in <!CONFUSING_BRANCH_CONDITION_WARNING!>b || b<!> -> {}
}
// ok
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
in (b && b) -> {}
in (b || b) -> {}
}
compiler/testData/diagnostics/tests/when/deprecatedSyntaxInConditions_before.kt
Vendored
+4 -4
View File
@@ -87,12 +87,12 @@ fun testWithSubject_bad_1(x: A) {
fun testWithSubject_bad_2(b: Boolean) {
// bad
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
<!CONFUSING_BRANCH_CONDITION_WARNING!>b && b<!> -> {}
<!CONFUSING_BRANCH_CONDITION_WARNING!>b || b<!> -> {}
}
// ok
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
(b && b) -> {}
(b || b) -> {}
}
@@ -191,12 +191,12 @@ fun testWithRange_bad_1(x: A) {
fun testWithRange_bad_2(b: Boolean) {
// bad
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
in <!CONFUSING_BRANCH_CONDITION_WARNING!>b && b<!> -> {}
in <!CONFUSING_BRANCH_CONDITION_WARNING!>b || b<!> -> {}
}
// ok
when (b) {
<!NO_ELSE_IN_WHEN!>when<!> (b) {
in (b && b) -> {}
in (b || b) -> {}
}
compiler/testData/diagnostics/tests/when/kt47922.fir.kt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ abstract class NonSealedBase {
sealed class ToState
val sealedTest: SealedBase.() -> ToState? = {
<!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!>(this) {}
<!NO_ELSE_IN_WHEN!>when<!>(this) {}
}
val nonSealedTest: NonSealedBase.() -> ToState? = {
compiler/testData/diagnostics/tests/when/kt47922.kt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ abstract class NonSealedBase {
sealed class ToState
val sealedTest: SealedBase.() -> ToState? = {
<!TYPE_MISMATCH!><!NON_EXHAUSTIVE_WHEN_STATEMENT!>when<!>(this) {}<!>
<!TYPE_MISMATCH!><!NO_ELSE_IN_WHEN!>when<!>(this) {}<!>
}
val nonSealedTest: NonSealedBase.() -> ToState? = {
compiler/testData/diagnostics/tests/when/kt49702.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ sealed class A {
class B:A()
class<!SYNTAX!><!> :A()
fun test(a : A) {
<!NON_EXHAUSTIVE_WHEN_STATEMENT("sealed class/interface; 'is B', 'is <no name provided>' branches or 'else' branch instead")!>when<!>(a) {
<!NO_ELSE_IN_WHEN!>when<!>(a) {
}
}
}