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

Switch kotlin version to 1.8

Browse Source 
with appropriate fixes in testdata, tests and other
places.
This commit is contained in:
Ilya Chernikov
2022-06-09 17:07:50 +02:00
parent 7fa459044f
commit bb996c1b27
179 changed files with 1038 additions and 978 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-5/neg/1.1.fir.kt
Vendored
+35
View File
@@ -0,0 +1,35 @@
// !DIAGNOSTICS: -UNUSED_EXPRESSION
// SKIP_TXT
// TESTCASE NUMBER: 5
fun case_5(value_1: Int, value_2: Int, value_3: Boolean?) {
when (value_1) {
1 -> when (value_3) {
<!CONFUSING_BRANCH_CONDITION_ERROR!>value_2 > 1000<!> -> "1"
<!CONFUSING_BRANCH_CONDITION_ERROR!>value_2 > 100<!> -> "2"
else -> "3"
}
2 -> when (value_3) {
<!CONFUSING_BRANCH_CONDITION_ERROR!>value_2 > 1000<!> -> "1"
<!CONFUSING_BRANCH_CONDITION_ERROR!>value_2 > 100<!> -> "2"
else -> ""
}
3 -> when (value_3) {
else -> ""
}
4 -> when (value_3) {
true -> "1"
false -> "2"
null -> "3"
else -> ""
}
5 -> when (value_3) {
true -> "1"
false -> "2"
else -> ""
}
6 -> when (value_3) {
else -> ""
}
}
}
compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-5/neg/1.1.kt
Vendored
+45
View File
@@ -0,0 +1,45 @@
// !DIAGNOSTICS: -UNUSED_EXPRESSION
// SKIP_TXT
/*
* KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
*
* SPEC VERSION: 0.1-313
* MAIN LINK: expressions, when-expression -> paragraph 5 -> sentence 1
* NUMBER: 1
* DESCRIPTION: 'When' with bound value and with different variants of expressions in the control structure body.
* HELPERS: typesProvider, classes, functions
*/
// TESTCASE NUMBER: 5
fun case_5(value_1: Int, value_2: Int, value_3: Boolean?) {
when (value_1) {
1 -> when (value_3) {
<!CONFUSING_BRANCH_CONDITION_ERROR!>value_2 > 1000<!> -> "1"
<!CONFUSING_BRANCH_CONDITION_ERROR!>value_2 > 100<!> -> "2"
else -> "3"
}
2 -> when (value_3) {
<!CONFUSING_BRANCH_CONDITION_ERROR!>value_2 > 1000<!> -> "1"
<!CONFUSING_BRANCH_CONDITION_ERROR!>value_2 > 100<!> -> "2"
else -> ""
}
3 -> when (value_3) {
else -> ""
}
4 -> when (value_3) {
true -> "1"
false -> "2"
null -> "3"
<!REDUNDANT_ELSE_IN_WHEN!>else<!> -> ""
}
5 -> when (value_3) {
true -> "1"
false -> "2"
else -> ""
}
6 -> when (value_3) {
else -> ""
}
}
}
compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-5/pos/1.1.fir.kt
Vendored
+3 -15
View File
@@ -46,16 +46,8 @@ fun case_4(value_1: Int, value_2: String, value_3: String) {
// TESTCASE NUMBER: 5
fun case_5(value_1: Int, value_2: Int, value_3: Boolean?) {
when (value_1) {
1 -> when (value_3) {
<!CONFUSING_BRANCH_CONDITION_WARNING!>value_2 > 1000<!> -> "1"
<!CONFUSING_BRANCH_CONDITION_WARNING!>value_2 > 100<!> -> "2"
else -> "3"
}
2 -> when (value_3) {
<!CONFUSING_BRANCH_CONDITION_WARNING!>value_2 > 1000<!> -> "1"
<!CONFUSING_BRANCH_CONDITION_WARNING!>value_2 > 100<!> -> "2"
else -> ""
}
1 -> "3"
2 -> ""
3 -> when (value_3) {
else -> ""
}
@@ -78,11 +70,7 @@ fun case_5(value_1: Int, value_2: Int, value_3: Boolean?) {
// TESTCASE NUMBER: 6
fun case_6(value_1: Int, value_2: Int, value_3: Boolean?) = when (value_1) {
1 -> when (value_3) {
<!CONFUSING_BRANCH_CONDITION_WARNING!>value_2 > 1000<!> -> 1
<!CONFUSING_BRANCH_CONDITION_WARNING!>value_2 > 100<!> -> 2
else -> 3
}
1 -> 3
else -> when (value_3) {
true -> 1
false -> 2
compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-5/pos/1.1.kt
Vendored
+2 -8
View File
@@ -55,16 +55,12 @@ fun case_4(value_1: Int, value_2: String, value_3: String) {
}
// TESTCASE NUMBER: 5
fun case_5(value_1: Int, value_2: Int, value_3: Boolean?) {
fun case_5(value_1: Int, <!UNUSED_PARAMETER!>value_2<!>: Int, value_3: Boolean?) {
when (value_1) {
1 -> when (value_3) {
<!CONFUSING_BRANCH_CONDITION_WARNING!>value_2 > 1000<!> -> "1"
<!CONFUSING_BRANCH_CONDITION_WARNING!>value_2 > 100<!> -> "2"
else -> "3"
}
2 -> when (value_3) {
<!CONFUSING_BRANCH_CONDITION_WARNING!>value_2 > 1000<!> -> "1"
<!CONFUSING_BRANCH_CONDITION_WARNING!>value_2 > 100<!> -> "2"
else -> ""
}
3 -> when (value_3) {
@@ -87,10 +83,8 @@ fun case_5(value_1: Int, value_2: Int, value_3: Boolean?) {
}
// TESTCASE NUMBER: 6
fun case_6(value_1: Int, value_2: Int, value_3: Boolean?) = when (value_1) {
fun case_6(value_1: Int, <!UNUSED_PARAMETER!>value_2<!>: Int, value_3: Boolean?) = when (value_1) {
1 -> when (value_3) {
<!CONFUSING_BRANCH_CONDITION_WARNING!>value_2 > 1000<!> -> 1
<!CONFUSING_BRANCH_CONDITION_WARNING!>value_2 > 100<!> -> 2
else -> 3
}
else -> when (value_3) {