Introduce "Lift return out of try" intention #KT-18830 Fixed

idea/testData/inspectionsLocal/liftOut/tryToAssignment/.inspection

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

idea/testData/inspectionsLocal/liftOut/tryToAssignment/basic.kt

@@ -0,0 +1,11 @@
+// HIGHLIGHT: INFORMATION
+
+fun test() {
+    var res: String? = null
+
+    <caret>try {
+        res = "success"
+    } catch (e: Exception) {
+        throw e
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/basic.kt.after

@@ -0,0 +1,11 @@
+// HIGHLIGHT: INFORMATION
+
+fun test() {
+    var res: String? = null
+
+    <caret>res = try {
+        "success"
+    } catch (e: Exception) {
+        throw e
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/block.kt

@@ -0,0 +1,15 @@
+// HIGHLIGHT: GENERIC_ERROR_OR_WARNING
+
+fun doSomething() {}
+
+fun test() {
+    var res: String? = null
+
+    <caret>try {
+        doSomething()
+        res = "success"
+    } catch (e: Exception) {
+        doSomething()
+        res = "failure"
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/block.kt.after

@@ -0,0 +1,15 @@
+// HIGHLIGHT: GENERIC_ERROR_OR_WARNING
+
+fun doSomething() {}
+
+fun test() {
+    var res: String? = null
+
+    <caret>res = try {
+        doSomething()
+        "success"
+    } catch (e: Exception) {
+        doSomething()
+        "failure"
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/cascade.kt

@@ -0,0 +1,18 @@
+// WITH_RUNTIME
+fun test() {
+    var res: String? = null
+
+    <caret>try {
+        try {
+            res = "success"
+        } catch (e: Exception) {
+            TODO()
+        }
+    } catch (e: Exception) {
+        try {
+            TODO()
+        } catch (e: Exception) {
+            res = "failure"
+        }
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/cascade.kt.after

@@ -0,0 +1,18 @@
+// WITH_RUNTIME
+fun test() {
+    var res: String? = null
+
+    <caret>res = try {
+        try {
+            "success"
+        } catch (e: Exception) {
+            TODO()
+        }
+    } catch (e: Exception) {
+        try {
+            TODO()
+        } catch (e: Exception) {
+            "failure"
+        }
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/finally.kt

@@ -0,0 +1,13 @@
+fun doSomething() {}
+
+fun test() {
+    var res: String? = null
+
+    <caret>try {
+        res = "success"
+    } catch (e: Exception) {
+        res = "failure"
+    } finally {
+        doSomething()
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/finally.kt.after

@@ -0,0 +1,13 @@
+fun doSomething() {}
+
+fun test() {
+    var res: String? = null
+
+    <caret>res = try {
+        "success"
+    } catch (e: Exception) {
+        "failure"
+    } finally {
+        doSomething()
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/finallyWithAssignment.kt

@@ -0,0 +1,12 @@
+// PROBLEM: none
+fun test() {
+    var res: String? = null
+
+    <caret>try {
+        res = "success"
+    } catch (e: Exception) {
+        res = "failure"
+    } finally {
+        res = "finally"
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/finallyWithCascadeAssignment.kt

@@ -0,0 +1,17 @@
+// PROBLEM: none
+fun doSomething() {}
+
+fun test(n: Int) {
+    var res: String? = null
+
+    <caret>try {
+        res = "success"
+    } catch (e: Exception) {
+        throw e
+    } finally {
+        if (n == 1)
+            doSomething()
+        else
+            res = "finally"
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/finallyWithCascadeUnmatchedAssignment.kt

@@ -0,0 +1,17 @@
+fun doSomething() {}
+
+fun test(n: Int) {
+    var res: String? = null
+    var foo: String? = null
+
+    <caret>try {
+        res = "success"
+    } catch (e: Exception) {
+        throw e
+    } finally {
+        if (n == 1)
+            doSomething()
+        else
+            foo = "finally"
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/finallyWithCascadeUnmatchedAssignment.kt.after

@@ -0,0 +1,17 @@
+fun doSomething() {}
+
+fun test(n: Int) {
+    var res: String? = null
+    var foo: String? = null
+
+    <caret>res = try {
+        "success"
+    } catch (e: Exception) {
+        throw e
+    } finally {
+        if (n == 1)
+            doSomething()
+        else
+            foo = "finally"
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/finallyWithUnmatchedAssignments.kt

@@ -0,0 +1,12 @@
+fun test() {
+    var res: String? = null
+    var foo: String? = null
+
+    <caret>try {
+        res = "success"
+    } catch (e: Exception) {
+        res = "failure"
+    } finally {
+        foo = "finally"
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/finallyWithUnmatchedAssignments.kt.after

@@ -0,0 +1,12 @@
+fun test() {
+    var res: String? = null
+    var foo: String? = null
+
+    <caret>res = try {
+        "success"
+    } catch (e: Exception) {
+        "failure"
+    } finally {
+        foo = "finally"
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/inner.kt

@@ -0,0 +1,14 @@
+fun test(n: Int) {
+    var res: String? = null
+
+    if (n == 1) {
+        <caret>try {
+            res = "success"
+        } catch (e: Exception) {
+            throw e
+        }
+    }
+    else {
+        res = "else"
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/inner.kt.after

@@ -0,0 +1,14 @@
+fun test(n: Int) {
+    var res: String? = null
+
+    if (n == 1) {
+        <caret>res = try {
+            "success"
+        } catch (e: Exception) {
+            throw e
+        }
+    }
+    else {
+        res = "else"
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/withUnmatchedAssignments.kt

@@ -0,0 +1,11 @@
+// PROBLEM: none
+fun test() {
+    var res: String? = null
+    var foo: String? = null
+
+    <caret>try {
+        res = "success"
+    } catch (e: Exception) {
+        foo = "exception"
+    }
+}

idea/testData/inspectionsLocal/liftOut/tryToAssignment/withoutTerminatingAssignment.kt

@@ -0,0 +1,13 @@
+// PROBLEM: none
+fun doSomething() {}
+
+fun test() {
+    var res: String? = null
+
+    <caret>try {
+        res = "success"
+    } catch (e: Exception) {
+        res = "failure"
+        doSomething()
+    }
+}