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

Convert "lift return / assignment" intentions into a single inspection

Browse Source 
Also includes minor test fix, related to KT-14900
This commit is contained in:
Mikhail Glukhikh
2017-06-27 13:01:33 +03:00
committed by Mikhail Glukhikh
parent 8f33bd0768
commit 2d1abda9a1
91 changed files with 373 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/intentions/branched/folding/ifToAssignment/.intention
Vendored
-1
View File
@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldIfToAssignmentIntention
idea/testData/intentions/branched/folding/ifToAssignment/cascadeIf.kt
Vendored
-18
View File
@@ -1,18 +0,0 @@
// WITH_RUNTIME
fun test(x: Any) {
var res: String
<caret>if (x is String)
when {
x.length > 3 -> res = "long string"
else -> res = "short string"
}
else if (x is Int)
when {
x > 999 || x < -99 -> res = "long int"
else -> res = "short int"
}
else if (x is Long)
TODO()
else
res = "I don't know"
}
idea/testData/intentions/branched/folding/ifToAssignment/cascadeIf.kt.after
Vendored
-18
View File
@@ -1,18 +0,0 @@
// WITH_RUNTIME
fun test(x: Any) {
var res: String
<caret>res = if (x is String)
when {
x.length > 3 -> "long string"
else -> "short string"
}
else if (x is Int)
when {
x > 999 || x < -99 -> "long int"
else -> "short int"
}
else if (x is Long)
TODO()
else
"I don't know"
}
idea/testData/intentions/branched/folding/ifToAssignment/ifElseIf.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// IS_APPLICABLE: false
fun test(n: Int) {
var a: String = ""
<caret>if (n == 1)
a = "one"
else if (n == 2)
a = "two"
}
idea/testData/intentions/branched/folding/ifToAssignment/ifElseIfElse.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
fun test(n: Int) {
val a: String
<caret>if (n == 1)
a = "one"
else if (n == 2)
a = "two"
else
a = "three"
}
idea/testData/intentions/branched/folding/ifToAssignment/ifElseIfElse.kt.after
Vendored
-9
View File
@@ -1,9 +0,0 @@
fun test(n: Int) {
val a: String
<caret>a = if (n == 1)
"one"
else if (n == 2)
"two"
else
"three"
}
idea/testData/intentions/branched/folding/ifToAssignment/ifElseifElseInconsistent.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
// IS_APPLICABLE: false
fun test(n: Int) {
val a: String
val b: String
<caret>if (n == 1)
a = "one"
else if (n == 2)
a = "two"
else
b = "three"
}
idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt
Vendored
-23
View File
@@ -1,23 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
var res: String
if (n == 1) {
<caret>if (3 > 2) {
doSomething("***")
res = "one"
} else {
doSomething("***")
res = "???"
}
} else if (n == 2) {
doSomething("***")
res = "two"
} else {
doSomething("***")
res = "too many"
}
return res
}
idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt.after
Vendored
-23
View File
@@ -1,23 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
var res: String
if (n == 1) {
<caret>res = if (3 > 2) {
doSomething("***")
"one"
} else {
doSomething("***")
"???"
}
} else if (n == 2) {
doSomething("***")
res = "two"
} else {
doSomething("***")
res = "too many"
}
return res
}
idea/testData/intentions/branched/folding/ifToAssignment/simpleIf.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
fun test(n: Int): String {
var res: String
<caret>if (n == 1) res = "one" else res = "two"
return res
}
idea/testData/intentions/branched/folding/ifToAssignment/simpleIf.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
fun test(n: Int): String {
var res: String
<caret>res = if (n == 1) "one" else "two"
return res
}
idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
fun test(n: Int): String {
var res: String = "!"
<caret>if (n == 1) res += "one" else res += "two"
return res
}
idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt.after
Vendored
-7
View File
@@ -1,7 +0,0 @@
fun test(n: Int): String {
var res: String = "!"
<caret>res += if (n == 1) "one" else "two"
return res
}
idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt
Vendored
-15
View File
@@ -1,15 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
var res: String
<caret>if (n == 1) {
doSomething("***")
res = "one"
} else {
doSomething("***")
res = "two"
}
return res
}
idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt.after
Vendored
-15
View File
@@ -1,15 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
var res: String
<caret>res = if (n == 1) {
doSomething("***")
"one"
} else {
doSomething("***")
"two"
}
return res
}
idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt
Vendored
-18
View File
@@ -1,18 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
var res: String = ""
<caret>if (n == 1) {
doSomething("***")
res = "one"
} else {
var res: String
doSomething("***")
res = "two"
}
return res
}
idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignmentOps.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
// IS_APPLICABLE: false
fun test(s: String): Int {
var n: Int = 1;
<caret>if (s.equals("add")) {
n += 1
} else {
n -= 1
}
return n
}
idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignments.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
// IS_APPLICABLE: false
fun test(n: Int): String {
var res: String = ""
var res2: String = ""
<caret>if (n == 1) {
res = "one"
} else {
res2 = "two"
}
return res + res2
}
idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
var res: String = ""
<caret>if (n == 1) {
doSomething("***")
res = "one"
}
return res
}
idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt
Vendored
-16
View File
@@ -1,16 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
var res: String
<caret>if (n == 1) {
res = "one"
doSomething("***")
} else {
doSomething("***")
res = "two"
}
return res
}
idea/testData/intentions/branched/folding/ifToReturn/.intention
Vendored
-1
View File
@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldIfToReturnIntention
idea/testData/intentions/branched/folding/ifToReturn/cascadeIf.kt
Vendored
-17
View File
@@ -1,17 +0,0 @@
// WITH_RUNTIME
fun test(x: Any): String {
<caret>if (x is String)
when {
x.length > 3 -> return "long string"
else -> return "short string"
}
else if (x is Int)
when {
x > 999 || x < -99 -> return "long int"
else -> return "short int"
}
else if (x is Long)
TODO()
else
return "I don't know"
}
idea/testData/intentions/branched/folding/ifToReturn/cascadeIf.kt.after
Vendored
-17
View File
@@ -1,17 +0,0 @@
// WITH_RUNTIME
fun test(x: Any): String {
<caret>return if (x is String)
when {
x.length > 3 -> "long string"
else -> "short string"
}
else if (x is Int)
when {
x > 999 || x < -99 -> "long int"
else -> "short int"
}
else if (x is Long)
TODO()
else
"I don't know"
}
idea/testData/intentions/branched/folding/ifToReturn/ifElseIf.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
// IS_APPLICABLE: false
fun test(n: Int): String {
<caret>if (n == 1)
return "one"
else if (n == 2)
return "two"
return "three"
}
idea/testData/intentions/branched/folding/ifToReturn/ifElseIfElse.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
fun test(n: Int): String {
<caret>if (n == 1)
return "one"
else if (n == 2)
return "two"
else
return "three"
}
idea/testData/intentions/branched/folding/ifToReturn/ifElseIfElse.kt.after
Vendored
-8
View File
@@ -1,8 +0,0 @@
fun test(n: Int): String {
<caret>return if (n == 1)
"one"
else if (n == 2)
"two"
else
"three"
}
idea/testData/intentions/branched/folding/ifToReturn/ifElseIfElseInconsistent.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
// IS_APPLICABLE: false
fun test(n: Int): String {
val a: String
<caret>if (n == 1)
return "one"
else if (n == 2)
return "two"
else
a = "three"
return a
}
idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt
Vendored
-19
View File
@@ -1,19 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
if (n == 1) {
<caret>if (3 > 2) {
doSomething("***")
return "one"
} else {
doSomething("***")
return "???"
}
} else if (n == 2) {
doSomething("***")
return "two"
} else {
doSomething("***")
return "too many"
}
}
idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt.after
Vendored
-19
View File
@@ -1,19 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
if (n == 1) {
<caret>return if (3 > 2) {
doSomething("***")
"one"
} else {
doSomething("***")
"???"
}
} else if (n == 2) {
doSomething("***")
return "two"
} else {
doSomething("***")
return "too many"
}
}
idea/testData/intentions/branched/folding/ifToReturn/simpleIf.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
fun test(n: Int): String {
<caret>if (n == 1)
return "one"
else
return "two"
}
idea/testData/intentions/branched/folding/ifToReturn/simpleIf.kt.after
Vendored
-6
View File
@@ -1,6 +0,0 @@
fun test(n: Int): String {
<caret>return if (n == 1)
"one"
else
"two"
}
idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt
Vendored
-11
View File
@@ -1,11 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
<caret>if (n == 1) {
doSomething("***")
return "one"
} else {
doSomething("***")
return "two"
}
}
idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt.after
Vendored
-11
View File
@@ -1,11 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
<caret>return if (n == 1) {
doSomething("***")
"one"
} else {
doSomething("***")
"two"
}
}
idea/testData/intentions/branched/folding/whenToAssignment/.intention
Vendored
-1
View File
@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldWhenToAssignmentIntention
idea/testData/intentions/branched/folding/whenToAssignment/cascadeWhen.kt
Vendored
-16
View File
@@ -1,16 +0,0 @@
// WITH_RUNTIME
fun test(x: Any) {
var res: String
<caret>when (x) {
is String ->
if (x.length > 3) res = "long string"
else res = "short string"
is Int ->
if (x > 999 || x < -99) res = "long int"
else res = "short int"
is Long ->
TODO()
else ->
res = "I don't know"
}
}
idea/testData/intentions/branched/folding/whenToAssignment/cascadeWhen.kt.after
Vendored
-16
View File
@@ -1,16 +0,0 @@
// WITH_RUNTIME
fun test(x: Any) {
var res: String
<caret>res = when (x) {
is String ->
if (x.length > 3) "long string"
else "short string"
is Int ->
if (x > 999 || x < -99) "long int"
else "short int"
is Long ->
TODO()
else ->
"I don't know"
}
}
idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt
Vendored
-23
View File
@@ -1,23 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
var res: String
if (3 > 2) {
<caret>when (n) {
1 -> {
doSomething("***")
res = "one"
}
else -> {
doSomething("***")
res = "two"
}
}
} else {
doSomething("***")
res = "???"
}
return res
}
idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after
Vendored
-23
View File
@@ -1,23 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
var res: String
if (3 > 2) {
<caret>res = when (n) {
1 -> {
doSomething("***")
"one"
}
else -> {
doSomething("***")
"two"
}
}
} else {
doSomething("***")
res = "???"
}
return res
}
idea/testData/intentions/branched/folding/whenToAssignment/insideLoop.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
fun foo(): Int {
var res = 0
loop@ while (true) {
<caret>when (1) {
1 -> res += 1
2 -> throw Exception()
3 -> break@loop
4 -> continue@loop
else -> return -1
}
}
return res
}
idea/testData/intentions/branched/folding/whenToAssignment/insideLoop.kt.after
Vendored
-13
View File
@@ -1,13 +0,0 @@
fun foo(): Int {
var res = 0
loop@ while (true) {
res += when (1) {
1 -> 1
2 -> throw Exception()
3 -> break@loop
4 -> continue@loop
else -> return -1
}
}
return res
}
idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
fun test(n: Int): String {
var res: String
<caret>when (n) {
1 -> res = "one"
else -> res = "two"
}
return res
}
idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt.after
Vendored
-10
View File
@@ -1,10 +0,0 @@
fun test(n: Int): String {
var res: String
<caret>res = when (n) {
1 -> "one"
else -> "two"
}
return res
}
idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt
Vendored
-18
View File
@@ -1,18 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
var res: String
<caret>when (n) {
1 -> {
doSomething("***")
res = "one"
}
else -> {
doSomething("***")
res = "two"
}
}
return res
}
idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt.after
Vendored
-18
View File
@@ -1,18 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
var res: String
<caret>res = when (n) {
1 -> {
doSomething("***")
"one"
}
else -> {
doSomething("***")
"two"
}
}
return res
}
idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt
Vendored
-21
View File
@@ -1,21 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
var res: String = ""
<caret>when (n) {
1 -> {
doSomething("***")
res = "one"
}
else -> {
var res: String
res = "two"
doSomething("***")
}
}
return res
}
idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt
Vendored
-20
View File
@@ -1,20 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
var res: String = ""
var res2: String = ""
<caret>when (n) {
1 -> {
doSomething("***")
res = "one"
}
else -> {
doSomething("***")
res2 = "two"
}
}
return res + res2
}
idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt
Vendored
-19
View File
@@ -1,19 +0,0 @@
// IS_APPLICABLE: false
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
var res: String
<caret>when (n) {
1 -> {
doSomething("***")
res = "one"
}
else -> {
res = "two"
doSomething("***")
}
}
return res
}
idea/testData/intentions/branched/folding/whenToReturn/.intention
Vendored
-1
View File
@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldWhenToReturnIntention
idea/testData/intentions/branched/folding/whenToReturn/cascadeWhen.kt
Vendored
-15
View File
@@ -1,15 +0,0 @@
// WITH_RUNTIME
fun test(x: Any): String {
<caret>when (x) {
is String ->
if (x.length > 3) return "long string"
else return "short string"
is Int ->
if (x > 999 || x < -99) return "long int"
else return "short int"
is Long ->
TODO()
else ->
return "I don't know"
}
}
idea/testData/intentions/branched/folding/whenToReturn/cascadeWhen.kt.after
Vendored
-15
View File
@@ -1,15 +0,0 @@
// WITH_RUNTIME
fun test(x: Any): String {
<caret>return when (x) {
is String ->
if (x.length > 3) "long string"
else "short string"
is Int ->
if (x > 999 || x < -99) "long int"
else "short int"
is Long ->
TODO()
else ->
"I don't know"
}
}
idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
if (3 > 2) {
<caret>when (n) {
1 -> return "one"
else -> return "two"
}
} else {
doSomething("***")
return "???"
}
}
idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt.after
Vendored
-13
View File
@@ -1,13 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
if (3 > 2) {
<caret>return when (n) {
1 -> "one"
else -> "two"
}
} else {
doSomething("***")
return "???"
}
}
idea/testData/intentions/branched/folding/whenToReturn/insideLoop.kt
Vendored
-12
View File
@@ -1,12 +0,0 @@
fun foo(): Int {
loop@ while (true) {
<caret>when (1) {
1 -> return 1
2 -> throw Exception()
3 -> break@loop
4 -> continue@loop
else -> return -1
}
}
return 0
}
idea/testData/intentions/branched/folding/whenToReturn/insideLoop.kt.after
Vendored
-12
View File
@@ -1,12 +0,0 @@
fun foo(): Int {
loop@ while (true) {
return when (1) {
1 -> 1
2 -> throw Exception()
3 -> break@loop
4 -> continue@loop
else -> -1
}
}
return 0
}
idea/testData/intentions/branched/folding/whenToReturn/simpleWhen.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
fun test(n: Int): String {
<caret>when (n) {
1 -> return "one"
else -> return "two"
}
}
idea/testData/intentions/branched/folding/whenToReturn/simpleWhen.kt.after
Vendored
-6
View File
@@ -1,6 +0,0 @@
fun test(n: Int): String {
<caret>return when (n) {
1 -> "one"
else -> "two"
}
}
idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt
Vendored
-14
View File
@@ -1,14 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
<caret>when (n) {
1 -> {
doSomething("***")
return "one"
}
else -> {
doSomething("***")
return "two"
}
}
}
idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after
Vendored
-14
View File
@@ -1,14 +0,0 @@
fun <T> doSomething(a: T) {}
fun test(n: Int): String {
<caret>return when (n) {
1 -> {
doSomething("***")
"one"
}
else -> {
doSomething("***")
"two"
}
}
}