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

Remove MergeWhenIntention

Browse Source 
Relates to #KT-31502
This commit is contained in:
Dmitry Gridin
2019-05-27 19:21:40 +07:00
parent 41daf99346
commit 2310826ec9
35 changed files with 0 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/intentions/branched/when/merge/.intention
Vendored
-1
View File
@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.MergeWhenIntention
idea/testData/intentions/branched/when/merge/hasCommentBetweenWhen.kt
Vendored
-15
View File
@@ -1,15 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(a: Int) {
<caret>when (a) {
0 -> doSomething("A")
1 -> doSomething("B")
}
// comment
when (a) {
0 -> doSomething("C")
1 -> doSomething("D")
}
}
idea/testData/intentions/branched/when/merge/hasCommentBetweenWhen.kt.after
Vendored
-16
View File
@@ -1,16 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(a: Int) {
<caret>when (a) {
0 -> {
doSomething("A")
doSomething("C")
}
1 -> {
doSomething("B")
doSomething("D")
}
}
// comment
}
idea/testData/intentions/branched/when/merge/hasSemicolonBetweenWhen.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(a: Int) {
<caret>when (a) {
0 -> doSomething("A")
1 -> doSomething("B")
};
when (a) {
0 -> doSomething("C")
1 -> doSomething("D")
}
}
idea/testData/intentions/branched/when/merge/hasSemicolonBetweenWhen.kt.after
Vendored
-14
View File
@@ -1,14 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(a: Int) {
<caret>when (a) {
0 -> {
doSomething("A")
doSomething("C")
}
1 -> {
doSomething("B")
doSomething("D")
}
}
}
idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt
Vendored
-35
View File
@@ -1,35 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> {
res = "one"
doSomething("A")
}
2 -> {
res = "two"
doSomething("B")
}
else -> {
res = "unknown"
doSomething("C")
}
}
when (n) {
1 -> {
doSomething("A")
doSomething("AA")
}
2 -> {
doSomething("B")
doSomething("BB")
}
else -> {
doSomething("C")
doSomething("CC")
}
}
}
idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt.after
Vendored
-26
View File
@@ -1,26 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
when (n) {
1 -> {
res = "one"
doSomething("A")
doSomething("A")
doSomething("AA")
}
2 -> {
res = "two"
doSomething("B")
doSomething("B")
doSomething("BB")
}
else -> {
res = "unknown"
doSomething("C")
doSomething("C")
doSomething("CC")
}
}
}
idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt
Vendored
-26
View File
@@ -1,26 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> {
res = "one"
doSomething("A")
}
2 -> {
res = "two"
doSomething("B")
}
else -> {
res = "unknown"
doSomething("C")
}
}
when (n) {
1 -> doSomething("AA")
2 -> doSomething("BB")
else -> doSomething("CC")
}
}
idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt.after
Vendored
-23
View File
@@ -1,23 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> {
res = "one"
doSomething("A")
doSomething("AA")
}
2 -> {
res = "two"
doSomething("B")
doSomething("BB")
}
else -> {
res = "unknown"
doSomething("C")
doSomething("CC")
}
}
}
idea/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt
Vendored
-40
View File
@@ -1,40 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> {
res = "one"
val x = "A"
doSomething(x)
}
2 -> {
res = "two"
val x = "B"
doSomething(x)
}
else -> {
res = "unknown"
val x = "C"
doSomething(x)
}
}
when (n) {
1 -> {
val x = "AA"
doSomething(x)
}
2 -> {
val x = "BB"
doSomething(x)
}
else -> {
val x = "CC"
doSomething(x)
}
}
}
idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt
Vendored
-38
View File
@@ -1,38 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> {
res = "one"
val x = "A"
doSomething(x)
}
2 -> {
res = "two"
val x = "B"
doSomething(x)
}
else -> {
res = "unknown"
val x = "C"
doSomething(x)
}
}
when (n) {
1 -> {
val y = "AA"
doSomething(y)
}
2 -> {
val y = "BB"
doSomething(y)
}
else -> {
val y = "CC"
doSomething(y)
}
}
}
idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt.after
Vendored
-29
View File
@@ -1,29 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
when (n) {
1 -> {
res = "one"
val x = "A"
doSomething(x)
val y = "AA"
doSomething(y)
}
2 -> {
res = "two"
val x = "B"
doSomething(x)
val y = "BB"
doSomething(y)
}
else -> {
res = "unknown"
val x = "C"
doSomething(x)
val y = "CC"
doSomething(y)
}
}
}
idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt
Vendored
-20
View File
@@ -1,20 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int) {
var res: String = ""
<caret>when (n) {
1 -> doSomething("A")
2 -> doSomething("B")
else -> doSomething("C")
}
when (n) {
1 -> res = "one"
2 -> res = "two"
else -> {
res = "unknown"
return
}
}
}
idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt.after
Vendored
-21
View File
@@ -1,21 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int) {
var res: String = ""
<caret>when (n) {
1 -> {
doSomething("A")
res = "one"
}
2 -> {
doSomething("B")
res = "two"
}
else -> {
doSomething("C")
res = "unknown"
return
}
}
}
idea/testData/intentions/branched/when/merge/mergeWithReturnBefore.kt
Vendored
-22
View File
@@ -1,22 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int) {
var res: String = ""
<caret>when (n) {
1 -> res = "one"
2 -> res = "two"
else -> {
res = "unknown"
return
}
}
when (n) {
1 -> doSomething("A")
2 -> doSomething("B")
else -> doSomething("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithSubject.kt
Vendored
-17
View File
@@ -1,17 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> res = "one"
2 -> res = "two"
else -> res = "unknown"
}
when (n) {
1 -> doSomething("A")
2 -> doSomething("B")
else -> doSomething("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithSubject.kt.after
Vendored
-20
View File
@@ -1,20 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
when (n) {
1 -> {
res = "one"
doSomething("A")
}
2 -> {
res = "two"
doSomething("B")
}
else -> {
res = "unknown"
doSomething("C")
}
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions1.kt
Vendored
-17
View File
@@ -1,17 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> res = "one"
2 -> res = "two"
else -> res = "unknown"
}
when (n) {
1 -> doSomething("A")
else -> doSomething("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions2.kt
Vendored
-19
View File
@@ -1,19 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> res = "one"
2 -> res = "two"
else -> res = "unknown"
}
when (n) {
1 -> doSomething("A")
2 -> doSomething("B")
3 -> doSomething("D")
else -> doSomething("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions3.kt
Vendored
-18
View File
@@ -1,18 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> res = "one"
2 -> res = "two"
else -> res = "unknown"
}
when (n) {
2 -> doSomething("B")
1 -> doSomething("A")
else -> doSomething("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions4.kt
Vendored
-17
View File
@@ -1,17 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when {
n == 1 -> res = "one"
n == 2 -> res = "two"
else -> res = "unknown"
}
when {
n == 1 -> doSomething("A")
else -> doSomething("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions5.kt
Vendored
-19
View File
@@ -1,19 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when {
n == 1 -> res = "one"
n == 2 -> res = "two"
else -> res = "unknown"
}
when {
n == 1 -> doSomething("A")
n == 2 -> doSomething("B")
n == 3 -> doSomething("D")
else -> doSomething("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions6.kt
Vendored
-18
View File
@@ -1,18 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when {
n == 1 -> res = "one"
n == 2 -> res = "two"
else -> res = "unknown"
}
when {
n == 2 -> doSomething("B")
n == 1 -> doSomething("A")
else -> doSomething("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions7.kt
Vendored
-18
View File
@@ -1,18 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when {
n == 1 -> res = "one"
n == 2 -> res = "two"
else -> res = "unknown"
}
when {
n + 1 == 2 -> doSomething("B")
n + 1 == 3 -> doSomething("A")
else -> doSomething("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects1.kt
Vendored
-18
View File
@@ -1,18 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> res = "one"
2 -> res = "two"
else -> res = "unknown"
}
when {
n == 1 -> doSomething("A")
n == 2 -> doSomething("B")
else -> doSomething("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects2.kt
Vendored
-18
View File
@@ -1,18 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when (n) {
1 -> res = "one"
2 -> res = "two"
else -> res = "unknown"
}
when (n + 1) {
1 -> doSomething("A")
2 -> doSomething("B")
else -> doSomething("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithVarSubject.kt
Vendored
-16
View File
@@ -1,16 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test() {
var n = 0
<caret>when (n) {
1 -> n = 2
2 -> n = 1
}
when (n) {
1 -> doSomething("A")
2 -> doSomething("B")
}
}
idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt
Vendored
-17
View File
@@ -1,17 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when {
n == 1 -> res = "one"
n == 2 -> res = "two"
else -> res = "unknown"
}
when {
n == 1 -> doSomething("A")
n == 2 -> doSomething("B")
else -> doSomething("C")
}
}
idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt.after
Vendored
-20
View File
@@ -1,20 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int) {
val res: String
<caret>when {
n == 1 -> {
res = "one"
doSomething("A")
}
n == 2 -> {
res = "two"
doSomething("B")
}
else -> {
res = "unknown"
doSomething("C")
}
}
}