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

[FIR] Implement ELSE_MISPLACED_IN_WHEN diagnostics, fix tests

Browse Source
This commit is contained in:
Ivan Kochurkin
2021-04-14 22:56:25 +03:00
committed by TeamCityServer
parent 7f4da93cc3
commit 00bc04b3df
17 changed files with 67 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/neg/2.1.fir.kt
Vendored
+3 -3
View File
@@ -18,7 +18,7 @@ fun case1() {
val z = JavaEnum.Val_3
val when1 = when (z) {
JavaEnum.Val_1 -> { false }
else -> {true}
<!ELSE_MISPLACED_IN_WHEN!>else<!> -> {true}
JavaEnum.Val_2 -> { false }
}
}
@@ -28,7 +28,7 @@ fun case1() {
fun case2() {
val z = JavaEnum.Val_3
val when1 = when (z) {
else -> {true}
<!ELSE_MISPLACED_IN_WHEN!>else<!> -> {true}
JavaEnum.Val_1 -> { false }
JavaEnum.Val_2 -> { false }
}
@@ -37,7 +37,7 @@ fun case2() {
fun case3() {
val z = JavaEnum.Val_3
val when1 = when (z) {
else -> {true}
<!ELSE_MISPLACED_IN_WHEN!>else<!> -> {true}
JavaEnum.Val_1 -> { false }
JavaEnum.Val_2 -> { false }
else -> { true }
compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/7.1.fir.kt
Vendored
+3 -3
View File
@@ -3,21 +3,21 @@
// TESTCASE NUMBER: 1
fun case_1(value_1: Int): String = when (value_1) {
else -> ""
<!ELSE_MISPLACED_IN_WHEN!>else<!> -> ""
1 -> ""
}
// TESTCASE NUMBER: 2
fun case_2(value_1: Int): String = when (value_1) {
1 -> ""
else -> ""
<!ELSE_MISPLACED_IN_WHEN!>else<!> -> ""
2 -> ""
}
// TESTCASE NUMBER: 3
fun case_3(value_1: Int): String {
when (value_1) {
else -> return ""
<!ELSE_MISPLACED_IN_WHEN!>else<!> -> return ""
else -> return ""
}
compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/7.2.fir.kt
Vendored
+3 -3
View File
@@ -3,21 +3,21 @@
// TESTCASE NUMBER: 1
fun case_1(value_1: Int): String = when {
else -> ""
<!ELSE_MISPLACED_IN_WHEN!>else<!> -> ""
value_1 == 1 -> ""
}
// TESTCASE NUMBER: 2
fun case_2(value_1: Int): String = when {
value_1 == 1 -> ""
else -> ""
<!ELSE_MISPLACED_IN_WHEN!>else<!> -> ""
value_1 == 2 -> ""
}
// TESTCASE NUMBER: 3
fun case_3(): String {
when {
else -> return ""
<!ELSE_MISPLACED_IN_WHEN!>else<!> -> return ""
else -> return ""
}