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

Also includes minor test fix, related to KT-14900

idea/testData/inspectionsLocal/liftOut/ifToAssignment/.inspection

@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.inspections.LiftReturnOrAssignmentInspection

idea/testData/inspectionsLocal/liftOut/ifToAssignment/cascadeIf.kt

@@ -0,0 +1,18 @@
+// 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/inspectionsLocal/liftOut/ifToAssignment/cascadeIf.kt.after

@@ -0,0 +1,18 @@
+// 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/inspectionsLocal/liftOut/ifToAssignment/ifElseIf.kt

@@ -0,0 +1,9 @@
+// PROBLEM: none
+
+fun test(n: Int) {
+    var a: String = ""
+    <caret>if (n == 1)
+        a = "one"
+    else if (n == 2)
+        a = "two"
+}

idea/testData/inspectionsLocal/liftOut/ifToAssignment/ifElseIfElse.kt

@@ -0,0 +1,9 @@
+fun test(n: Int) {
+    val a: String
+    <caret>if (n == 1)
+        a = "one"
+    else if (n == 2)
+        a = "two"
+    else
+        a = "three"
+}

idea/testData/inspectionsLocal/liftOut/ifToAssignment/ifElseIfElse.kt.after

@@ -0,0 +1,9 @@
+fun test(n: Int) {
+    val a: String
+    <caret>a = if (n == 1)
+        "one"
+    else if (n == 2)
+        "two"
+    else
+        "three"
+}

idea/testData/inspectionsLocal/liftOut/ifToAssignment/ifElseifElseInconsistent.kt

@@ -0,0 +1,12 @@
+// PROBLEM: none
+
+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/inspectionsLocal/liftOut/ifToAssignment/innerIfTransformed.kt

@@ -0,0 +1,23 @@
+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/inspectionsLocal/liftOut/ifToAssignment/innerIfTransformed.kt.after

@@ -0,0 +1,23 @@
+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/inspectionsLocal/liftOut/ifToAssignment/simpleIf.kt

@@ -0,0 +1,7 @@
+fun test(n: Int): String {
+    var res: String
+
+    <caret>if (n == 1) res = "one" else res = "two"
+
+    return res
+}

idea/testData/inspectionsLocal/liftOut/ifToAssignment/simpleIf.kt.after

@@ -0,0 +1,7 @@
+fun test(n: Int): String {
+    var res: String
+
+    <caret>res = if (n == 1) "one" else "two"
+
+    return res
+}

idea/testData/inspectionsLocal/liftOut/ifToAssignment/simpleIfWithAugmentedAssignment.kt

@@ -0,0 +1,7 @@
+fun test(n: Int): String {
+    var res: String = "!"
+
+    <caret>if (n == 1) res += "one" else res += "two"
+
+    return res
+}

idea/testData/inspectionsLocal/liftOut/ifToAssignment/simpleIfWithAugmentedAssignment.kt.after

@@ -0,0 +1,7 @@
+fun test(n: Int): String {
+    var res: String = "!"
+
+    <caret>res += if (n == 1) "one" else "two"
+
+    return res
+}

idea/testData/inspectionsLocal/liftOut/ifToAssignment/simpleIfWithBlocks.kt

@@ -0,0 +1,15 @@
+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/inspectionsLocal/liftOut/ifToAssignment/simpleIfWithBlocks.kt.after

@@ -0,0 +1,15 @@
+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/inspectionsLocal/liftOut/ifToAssignment/simpleIfWithShadowedVar.kt

@@ -0,0 +1,18 @@
+// PROBLEM: none
+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/inspectionsLocal/liftOut/ifToAssignment/simpleIfWithUnmatchedAssignmentOps.kt

@@ -0,0 +1,12 @@
+// PROBLEM: none
+fun test(s: String): Int {
+    var n: Int = 1;
+
+    <caret>if (s.equals("add")) {
+        n += 1
+    } else {
+        n -= 1
+    }
+
+    return n
+}

idea/testData/inspectionsLocal/liftOut/ifToAssignment/simpleIfWithUnmatchedAssignments.kt

@@ -0,0 +1,13 @@
+// PROBLEM: none
+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/inspectionsLocal/liftOut/ifToAssignment/simpleIfWithoutElse.kt

@@ -0,0 +1,13 @@
+// PROBLEM: none
+fun <T> doSomething(a: T) {}
+
+fun test(n: Int): String {
+    var res: String = ""
+
+    <caret>if (n == 1) {
+        doSomething("***")
+        res = "one"
+    }
+
+    return res
+}

idea/testData/inspectionsLocal/liftOut/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt

@@ -0,0 +1,16 @@
+// PROBLEM: none
+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/inspectionsLocal/liftOut/ifToReturn/.inspection

@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.inspections.LiftReturnOrAssignmentInspection

idea/testData/inspectionsLocal/liftOut/ifToReturn/cascadeIf.kt

@@ -0,0 +1,17 @@
+// 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/inspectionsLocal/liftOut/ifToReturn/cascadeIf.kt.after

@@ -0,0 +1,17 @@
+// 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/inspectionsLocal/liftOut/ifToReturn/ifElseIf.kt

@@ -0,0 +1,10 @@
+// PROBLEM: none
+
+fun test(n: Int): String {
+    <caret>if (n == 1)
+        return "one"
+    else if (n == 2)
+        return "two"
+
+    return "three"
+}

idea/testData/inspectionsLocal/liftOut/ifToReturn/ifElseIfElse.kt

@@ -0,0 +1,8 @@
+fun test(n: Int): String {
+    <caret>if (n == 1)
+        return "one"
+    else if (n == 2)
+        return "two"
+    else
+        return "three"
+}

idea/testData/inspectionsLocal/liftOut/ifToReturn/ifElseIfElse.kt.after

@@ -0,0 +1,8 @@
+fun test(n: Int): String {
+    <caret>return if (n == 1)
+        "one"
+    else if (n == 2)
+        "two"
+    else
+        "three"
+}

idea/testData/inspectionsLocal/liftOut/ifToReturn/ifElseIfElseInconsistent.kt

@@ -0,0 +1,10 @@
+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/inspectionsLocal/liftOut/ifToReturn/ifElseIfElseInconsistent.kt.after

@@ -0,0 +1,10 @@
+fun test(n: Int): String {
+    val a: String
+    a = if (n == 1)
+        return "one"
+    else if (n == 2)
+        return "two"
+    else
+        "three"
+    return a
+}

idea/testData/inspectionsLocal/liftOut/ifToReturn/innerIfTransformed.kt

@@ -0,0 +1,19 @@
+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/inspectionsLocal/liftOut/ifToReturn/innerIfTransformed.kt.after

@@ -0,0 +1,19 @@
+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/inspectionsLocal/liftOut/ifToReturn/simpleIf.kt

@@ -0,0 +1,6 @@
+fun test(n: Int): String {
+    <caret>if (n == 1)
+      return "one"
+    else
+      return "two"
+}

idea/testData/inspectionsLocal/liftOut/ifToReturn/simpleIf.kt.after

@@ -0,0 +1,6 @@
+fun test(n: Int): String {
+    <caret>return if (n == 1)
+        "one"
+    else
+        "two"
+}

idea/testData/inspectionsLocal/liftOut/ifToReturn/simpleIfWithBlocks.kt

@@ -0,0 +1,11 @@
+fun <T> doSomething(a: T) {}
+
+fun test(n: Int): String {
+    <caret>if (n == 1) {
+        doSomething("***")
+        return "one"
+    } else {
+        doSomething("***")
+        return "two"
+    }
+}

idea/testData/inspectionsLocal/liftOut/ifToReturn/simpleIfWithBlocks.kt.after

@@ -0,0 +1,11 @@
+fun <T> doSomething(a: T) {}
+
+fun test(n: Int): String {
+    <caret>return if (n == 1) {
+        doSomething("***")
+        "one"
+    } else {
+        doSomething("***")
+        "two"
+    }
+}

idea/testData/inspectionsLocal/liftOut/whenToAssignment/.inspection

@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.inspections.LiftReturnOrAssignmentInspection

idea/testData/inspectionsLocal/liftOut/whenToAssignment/cascadeWhen.kt

@@ -0,0 +1,16 @@
+// 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/inspectionsLocal/liftOut/whenToAssignment/cascadeWhen.kt.after

@@ -0,0 +1,16 @@
+// 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/inspectionsLocal/liftOut/whenToAssignment/innerWhenTransformed.kt

@@ -0,0 +1,23 @@
+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/inspectionsLocal/liftOut/whenToAssignment/innerWhenTransformed.kt.after

@@ -0,0 +1,23 @@
+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/inspectionsLocal/liftOut/whenToAssignment/insideLoop.kt

@@ -0,0 +1,13 @@
+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/inspectionsLocal/liftOut/whenToAssignment/insideLoop.kt.after

@@ -0,0 +1,13 @@
+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/inspectionsLocal/liftOut/whenToAssignment/simpleWhen.kt

@@ -0,0 +1,10 @@
+fun test(n: Int): String {
+    var res: String
+
+    <caret>when (n) {
+        1 -> res = "one"
+        else -> res = "two"
+    }
+
+    return res
+}

idea/testData/inspectionsLocal/liftOut/whenToAssignment/simpleWhen.kt.after

@@ -0,0 +1,10 @@
+fun test(n: Int): String {
+    var res: String
+
+    <caret>res = when (n) {
+        1 -> "one"
+        else -> "two"
+    }
+
+    return res
+}

idea/testData/inspectionsLocal/liftOut/whenToAssignment/simpleWhenWithBlocks.kt

@@ -0,0 +1,18 @@
+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/inspectionsLocal/liftOut/whenToAssignment/simpleWhenWithBlocks.kt.after

@@ -0,0 +1,18 @@
+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/inspectionsLocal/liftOut/whenToAssignment/simpleWhenWithShadowedVar.kt

@@ -0,0 +1,21 @@
+// PROBLEM: none
+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/inspectionsLocal/liftOut/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt

@@ -0,0 +1,20 @@
+// PROBLEM: none
+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/inspectionsLocal/liftOut/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt

@@ -0,0 +1,19 @@
+// PROBLEM: none
+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/inspectionsLocal/liftOut/whenToReturn/.inspection

@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.inspections.LiftReturnOrAssignmentInspection

idea/testData/inspectionsLocal/liftOut/whenToReturn/cascadeWhen.kt

@@ -0,0 +1,15 @@
+// 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/inspectionsLocal/liftOut/whenToReturn/cascadeWhen.kt.after

@@ -0,0 +1,15 @@
+// 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/inspectionsLocal/liftOut/whenToReturn/innerWhenTransformed.kt

@@ -0,0 +1,13 @@
+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/inspectionsLocal/liftOut/whenToReturn/innerWhenTransformed.kt.after

@@ -0,0 +1,13 @@
+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/inspectionsLocal/liftOut/whenToReturn/insideLoop.kt

@@ -0,0 +1,12 @@
+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/inspectionsLocal/liftOut/whenToReturn/insideLoop.kt.after

@@ -0,0 +1,12 @@
+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/inspectionsLocal/liftOut/whenToReturn/simpleWhen.kt

@@ -0,0 +1,6 @@
+fun test(n: Int): String {
+    <caret>when (n) {
+      1 -> return "one"
+      else -> return "two"
+    }
+}

idea/testData/inspectionsLocal/liftOut/whenToReturn/simpleWhen.kt.after

@@ -0,0 +1,6 @@
+fun test(n: Int): String {
+    <caret>return when (n) {
+        1 -> "one"
+        else -> "two"
+    }
+}

idea/testData/inspectionsLocal/liftOut/whenToReturn/simpleWhenWithBlocks.kt

@@ -0,0 +1,14 @@
+fun <T> doSomething(a: T) {}
+
+fun test(n: Int): String {
+    <caret>when (n) {
+        1 -> {
+            doSomething("***")
+            return "one"
+        }
+        else -> {
+            doSomething("***")
+            return "two"
+        }
+    }
+}

idea/testData/inspectionsLocal/liftOut/whenToReturn/simpleWhenWithBlocks.kt.after

@@ -0,0 +1,14 @@
+fun <T> doSomething(a: T) {}
+
+fun test(n: Int): String {
+    <caret>return when (n) {
+        1 -> {
+            doSomething("***")
+            "one"
+        }
+        else -> {
+            doSomething("***")
+            "two"
+        }
+    }
+}