Invert if: more correct handling of empty returns #KT-13444 Fixed

(cherry picked from commit be2adaf)

idea/testData/intentions/invertIfCondition/ifWithBothBranchesReturn.kt

@@ -0,0 +1,7 @@
+fun println(s: String) {}
+
+fun foo(y: Boolean) {
+    <caret>if (!y) return
+    println("no1")
+    return
+}

idea/testData/intentions/invertIfCondition/ifWithBothBranchesReturn.kt.after

@@ -0,0 +1,7 @@
+fun println(s: String) {}
+
+fun foo(y: Boolean) {
+    if (y) {
+        println("no1")
+    }
+}

idea/testData/intentions/invertIfCondition/ifWithBothBranchesSetter.kt

@@ -0,0 +1,6 @@
+var foo: Boolean = false
+    set(arg) {
+        <caret>if (field == arg) return
+        field = arg
+        return
+    }

idea/testData/intentions/invertIfCondition/ifWithBothBranchesSetter.kt.after

@@ -0,0 +1,6 @@
+var foo: Boolean = false
+    set(arg) {
+        if (field != arg) {
+            field = arg
+        }
+    }

idea/testData/intentions/invertIfCondition/lambdaNonLocalAndLocalReturn.kt

@@ -0,0 +1,12 @@
+inline fun call(f: () -> Unit) = f()
+
+fun bar() {}
+
+fun foo(arg: Boolean) {
+    call {
+        <caret>if (!arg) return@call
+        bar()
+        return
+    }
+    bar()
+}

idea/testData/intentions/invertIfCondition/lambdaNonLocalAndLocalReturn.kt.after

@@ -0,0 +1,14 @@
+inline fun call(f: () -> Unit) = f()
+
+fun bar() {}
+
+fun foo(arg: Boolean) {
+    call {
+        if (arg) {
+            bar()
+            return
+        }
+        return@call
+    }
+    bar()
+}

idea/testData/intentions/invertIfCondition/lambdaNonLocalReturn.kt

@@ -0,0 +1,12 @@
+inline fun call(f: () -> Unit) = f()
+
+fun bar() {}
+
+fun foo(arg: Boolean) {
+    call {
+        <caret>if (!arg) return
+        bar()
+        return
+    }
+    bar()
+}

idea/testData/intentions/invertIfCondition/lambdaNonLocalReturn.kt.after

@@ -0,0 +1,13 @@
+inline fun call(f: () -> Unit) = f()
+
+fun bar() {}
+
+fun foo(arg: Boolean) {
+    call {
+        if (arg) {
+            bar()
+        }
+        return
+    }
+    bar()
+}

idea/testData/intentions/invertIfCondition/nestedIfWithReturn.kt

@@ -0,0 +1,10 @@
+fun println(s: String) {}
+
+fun foo(x: Boolean, y: Boolean) {
+    if (x) {
+        <caret>if (!y) return
+        println("no1")
+        return
+    }
+    println("no2")
+}

idea/testData/intentions/invertIfCondition/nestedIfWithReturn.kt.after

@@ -0,0 +1,11 @@
+fun println(s: String) {}
+
+fun foo(x: Boolean, y: Boolean) {
+    if (x) {
+        if (y) {
+            println("no1")
+        }
+        return
+    }
+    println("no2")
+}