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

Implement "Merge when" intention

Browse Source
This commit is contained in:
Alexey Sedunov
2013-11-18 18:45:13 +04:00
parent d9b1c88bf4
commit 9f5ee13c20
35 changed files with 742 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt
+33
View File
@@ -0,0 +1,33 @@
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> {
res = "one"
println("A")
}
2 -> {
res = "two"
println("B")
}
else -> {
res = "unknown"
println("C")
}
}
when (n) {
1 -> {
println("A")
println("AA")
}
2 -> {
println("B")
println("BB")
}
else -> {
println("C")
println("CC")
}
}
}
idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt.after
+24
View File
@@ -0,0 +1,24 @@
fun test(n: Int) {
val res: String
when (n) {
1 -> {
res = "one"
println("A")
println("A")
println("AA")
}
2 -> {
res = "two"
println("B")
println("B")
println("BB")
}
else -> {
res = "unknown"
println("C")
println("C")
println("CC")
}
}
}
idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt
+24
View File
@@ -0,0 +1,24 @@
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> {
res = "one"
println("A")
}
2 -> {
res = "two"
println("B")
}
else -> {
res = "unknown"
println("C")
}
}
when (n) {
1 -> println("AA")
2 -> println("BB")
else -> println("CC")
}
}
idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt.after
+21
View File
@@ -0,0 +1,21 @@
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> {
res = "one"
println("A")
println("AA")
}
2 -> {
res = "two"
println("B")
println("BB")
}
else -> {
res = "unknown"
println("C")
println("CC")
}
}
}
idea/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt
+37
View File
@@ -0,0 +1,37 @@
// IS_APPLICABLE: false
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> {
res = "one"
val x = "A"
println(x)
}
2 -> {
res = "two"
val x = "B"
println(x)
}
else -> {
res = "unknown"
val x = "C"
println(x)
}
}
when (n) {
1 -> {
val x = "AA"
println(x)
}
2 -> {
val x = "BB"
println(x)
}
else -> {
val x = "CC"
println(x)
}
}
}
idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt
+36
View File
@@ -0,0 +1,36 @@
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> {
res = "one"
val x = "A"
println(x)
}
2 -> {
res = "two"
val x = "B"
println(x)
}
else -> {
res = "unknown"
val x = "C"
println(x)
}
}
when (n) {
1 -> {
val y = "AA"
println(y)
}
2 -> {
val y = "BB"
println(y)
}
else -> {
val y = "CC"
println(y)
}
}
}
idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt.after
+27
View File
@@ -0,0 +1,27 @@
fun test(n: Int) {
val res: String
when (n) {
1 -> {
res = "one"
val x = "A"
println(x)
val y = "AA"
println(y)
}
2 -> {
res = "two"
val x = "B"
println(x)
val y = "BB"
println(y)
}
else -> {
res = "unknown"
val x = "C"
println(x)
val y = "CC"
println(y)
}
}
}
idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt
+18
View File
@@ -0,0 +1,18 @@
fun test(n: Int) {
var res: String = ""
<caret>when (n) {
1 -> println("A")
2 -> println("B")
else -> println("C")
}
when (n) {
1 -> res = "one"
2 -> res = "two"
else -> {
res = "unknown"
return
}
}
}
idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt.after
+19
View File
@@ -0,0 +1,19 @@
fun test(n: Int) {
var res: String = ""
<caret>when (n) {
1 -> {
println("A")
res = "one"
}
2 -> {
println("B")
res = "two"
}
else -> {
println("C")
res = "unknown"
return
}
}
}
idea/testData/intentions/branched/when/merge/mergeWithReturnBefore.kt
+19
View File
@@ -0,0 +1,19 @@
// IS_APPLICABLE: false
fun test(n: Int) {
var res: String = ""
<caret>when (n) {
1 -> res = "one"
2 -> res = "two"
else -> {
res = "unknown"
return
}
}
when (n) {
1 -> println("A")
2 -> println("B")
else -> println("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithSubject.kt
+15
View File
@@ -0,0 +1,15 @@
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> res = "one"
2 -> res = "two"
else -> res = "unknown"
}
when (n) {
1 -> println("A")
2 -> println("B")
else -> println("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithSubject.kt.after
+18
View File
@@ -0,0 +1,18 @@
fun test(n: Int) {
val res: String
when (n) {
1 -> {
res = "one"
println("A")
}
2 -> {
res = "two"
println("B")
}
else -> {
res = "unknown"
println("C")
}
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions1.kt
+15
View File
@@ -0,0 +1,15 @@
// IS_APPLICABLE: false
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> res = "one"
2 -> res = "two"
else -> res = "unknown"
}
when (n) {
1 -> println("A")
else -> println("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions2.kt
+17
View File
@@ -0,0 +1,17 @@
// IS_APPLICABLE: false
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> res = "one"
2 -> res = "two"
else -> res = "unknown"
}
when (n) {
1 -> println("A")
2 -> println("B")
3 -> println("D")
else -> println("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions3.kt
+16
View File
@@ -0,0 +1,16 @@
// IS_APPLICABLE: false
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> res = "one"
2 -> res = "two"
else -> res = "unknown"
}
when (n) {
2 -> println("B")
1 -> println("A")
else -> println("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions4.kt
+15
View File
@@ -0,0 +1,15 @@
// IS_APPLICABLE: false
fun test(n: Int) {
val res: String
<caret>when {
n == 1 -> res = "one"
n == 2 -> res = "two"
else -> res = "unknown"
}
when {
n == 1 -> println("A")
else -> println("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions5.kt
+17
View File
@@ -0,0 +1,17 @@
// IS_APPLICABLE: false
fun test(n: Int) {
val res: String
<caret>when {
n == 1 -> res = "one"
n == 2 -> res = "two"
else -> res = "unknown"
}
when {
n == 1 -> println("A")
n == 2 -> println("B")
n == 3 -> println("D")
else -> println("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions6.kt
+16
View File
@@ -0,0 +1,16 @@
// IS_APPLICABLE: false
fun test(n: Int) {
val res: String
<caret>when {
n == 1 -> res = "one"
n == 2 -> res = "two"
else -> res = "unknown"
}
when {
n == 2 -> println("B")
n == 1 -> println("A")
else -> println("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions7.kt
+16
View File
@@ -0,0 +1,16 @@
// IS_APPLICABLE: false
fun test(n: Int) {
val res: String
<caret>when {
n == 1 -> res = "one"
n == 2 -> res = "two"
else -> res = "unknown"
}
when {
n + 1 == 2 -> println("B")
n + 1 == 3 -> println("A")
else -> println("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects1.kt
+16
View File
@@ -0,0 +1,16 @@
// IS_APPLICABLE: false
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> res = "one"
2 -> res = "two"
else -> res = "unknown"
}
when {
n == 1 -> println("A")
n == 2 -> println("B")
else -> println("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects2.kt
+16
View File
@@ -0,0 +1,16 @@
// IS_APPLICABLE: false
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> res = "one"
2 -> res = "two"
else -> res = "unknown"
}
when (n + 1) {
1 -> println("A")
2 -> println("B")
else -> println("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt
+15
View File
@@ -0,0 +1,15 @@
fun test(n: Int) {
val res: String
<caret>when {
n == 1 -> res = "one"
n == 2 -> res = "two"
else -> res = "unknown"
}
when {
n == 1 -> println("A")
n == 2 -> println("B")
else -> println("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt.after
+18
View File
@@ -0,0 +1,18 @@
fun test(n: Int) {
val res: String
<caret>when {
n == 1 -> {
res = "one"
println("A")
}
n == 2 -> {
res = "two"
println("B")
}
else -> {
res = "unknown"
println("C")
}
}
}