Use of expressions instead of plain text when converting when's

This commit is contained in:
Valentin Kipyatkov
2015-05-06 12:16:39 +03:00
parent 66a90916fe
commit ada11ca5e9
14 changed files with 84 additions and 92 deletions
@@ -1,5 +1,5 @@
fun test(n: Int): String {
return <caret>if ((n < 0) || (n > 1000)) "unknown"
return <caret>if (n < 0 || n > 1000) "unknown"
else if (n <= 10) "small"
else if (n <= 100) "average"
else "big"
@@ -1,6 +1,6 @@
fun test(n: Int): String {
return <caret>if ((n in 0..5) || (n in 5..10)) "small"
else if ((n in 10..50) || (n in 50..100)) "average"
else if ((n in 100..500) || (n in 500..1000)) "big"
return <caret>if (n in 0..5 || n in 5..10) "small"
else if (n in 10..50 || n in 50..100) "average"
else if (n in 100..500 || n in 500..1000) "big"
else "unknown"
}
@@ -0,0 +1,7 @@
fun test(n: Int): String {
return <caret>when (n) {
is -> "String"
in -> "1..10"
else -> "unknown"
}
}
@@ -0,0 +1,5 @@
fun test(n: Int): String {
return if (n is ) "String"
else if (n in) "1..10"
else "unknown"
}
@@ -0,0 +1,10 @@
// ERROR: Expected condition of type kotlin.Boolean
// ERROR: Expected condition of type kotlin.Boolean
fun test(n: Int): String {
return <caret>when {
is String -> "String"
in 1..10 -> "1..10"
else -> "unknown"
}
}
@@ -0,0 +1,8 @@
// ERROR: Expected condition of type kotlin.Boolean
// ERROR: Expected condition of type kotlin.Boolean
fun test(n: Int): String {
return if (_ is String) "String"
else if (_ in 1..10) "1..10"
else "unknown"
}