Rename: intention tests "ifNullToElvis" --> "foldInitializerAndIfToElvis"

idea/testData/intentions/foldInitializerAndIfToElvis/.intention

@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.FoldInitializerAndIfToElvisIntention

idea/testData/intentions/foldInitializerAndIfToElvis/Break.kt

@@ -0,0 +1,6 @@
+fun foo(p: List<String?>) {
+    for (i in 1..10) {
+        val v = p[i]
+        <caret>if (v == null) break
+    }
+}

idea/testData/intentions/foldInitializerAndIfToElvis/Break.kt.after

@@ -0,0 +1,5 @@
+fun foo(p: List<String?>) {
+    for (i in 1..10) {
+        val v = p[i] ?: <caret>break
+    }
+}

idea/testData/intentions/foldInitializerAndIfToElvis/CommentInBlock.kt

@@ -0,0 +1,8 @@
+fun foo(p: List<String?>): Int {
+    val v = p[0]
+    <caret>if (v == null) {
+        // return -1 if null
+        return -1
+    }
+    return v.length
+}

idea/testData/intentions/foldInitializerAndIfToElvis/CommentInBlock.kt.after

@@ -0,0 +1,5 @@
+fun foo(p: List<String?>): Int {
+    val v = p[0] ?: // return -1 if null
+            <caret>return -1
+    return v.length
+}

idea/testData/intentions/foldInitializerAndIfToElvis/Comments.kt

@@ -0,0 +1,6 @@
+fun foo(p: List<String?>): Int {
+    val v = p[0]
+    // now check if v is null
+    <caret>if (v == null/* null */) return -1 // return -1
+    return v.length
+}

idea/testData/intentions/foldInitializerAndIfToElvis/Comments.kt.after

@@ -0,0 +1,6 @@
+fun foo(p: List<String?>): Int {
+    val v = p[0] ?: /* null */<caret>return -1
+    // now check if v is null
+    // return -1
+    return v.length
+}

idea/testData/intentions/foldInitializerAndIfToElvis/Comments2.kt

@@ -0,0 +1,8 @@
+fun foo(p: List<String?>): Int {
+    val v = p[0]
+    <caret>if (v == null) { // v is null
+        // we should do something with it
+        return -1 // let's return -1
+    } // end of if
+    return v.length
+}

idea/testData/intentions/foldInitializerAndIfToElvis/Comments2.kt.after

@@ -0,0 +1,7 @@
+fun foo(p: List<String?>): Int {
+    val v = p[0] ?: // v is null
+            // we should do something with it
+            return -1 // let's return -1
+    // end of if
+    return v.length
+}

idea/testData/intentions/foldInitializerAndIfToElvis/Continue.kt

@@ -0,0 +1,6 @@
+fun foo(p: List<String?>) {
+    for (i in 1..10) {
+        val v = p[i]
+        <caret>if (v == null) continue
+    }
+}

idea/testData/intentions/foldInitializerAndIfToElvis/Continue.kt.after

@@ -0,0 +1,5 @@
+fun foo(p: List<String?>) {
+    for (i in 1..10) {
+        val v = p[i] ?: <caret>continue
+    }
+}

idea/testData/intentions/foldInitializerAndIfToElvis/ExplicitValType.kt

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+fun foo(): String? = null
+
+fun bar() {
+    val v: String? = foo()
+    <caret>if (v == null) throw Exception()
+    v.length
+}

idea/testData/intentions/foldInitializerAndIfToElvis/ExplicitValType.kt.after

@@ -0,0 +1,7 @@
+// WITH_RUNTIME
+fun foo(): String? = null
+
+fun bar() {
+    val v: String = foo() ?: throw Exception()
+    v.length
+}

idea/testData/intentions/foldInitializerAndIfToElvis/ExplicitVarType.kt

@@ -0,0 +1,9 @@
+// WITH_RUNTIME
+
+fun foo(): String? = null
+
+fun bar() {
+    var v: String? = foo()
+    <caret>if (v == null) throw Exception()
+    v = null
+}

idea/testData/intentions/foldInitializerAndIfToElvis/ExplicitVarType.kt.after

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+
+fun foo(): String? = null
+
+fun bar() {
+    var v: String? = foo() ?: throw Exception()
+    v = null
+}

idea/testData/intentions/foldInitializerAndIfToElvis/IfNotNull.kt

@@ -0,0 +1,6 @@
+// IS_APPLICABLE: false
+fun foo(p: List<String?>): Int {
+    val v = p[0]
+    <caret>if (v != null) return -1
+    return 0
+}

idea/testData/intentions/foldInitializerAndIfToElvis/MultiStatementBlock.kt

@@ -0,0 +1,10 @@
+// IS_APPLICABLE: false
+fun foo(p: List<String?>) {
+    val v = p[0]
+    <caret>if (v == null) {
+        bar()
+        return
+    }
+}
+
+fun bar(){}

idea/testData/intentions/foldInitializerAndIfToElvis/NotExit.kt

@@ -0,0 +1,8 @@
+// IS_APPLICABLE: false
+fun foo(p: List<String?>): Int? {
+    val v = p[0]
+    <caret>if (v == null) bar()
+    return v?.length
+}
+
+fun bar(){}

idea/testData/intentions/foldInitializerAndIfToElvis/NotIs.kt

@@ -0,0 +1,4 @@
+fun foo(arg: Any?) {
+    val n = arg
+    if (<caret>n !is Int) return
+}

idea/testData/intentions/foldInitializerAndIfToElvis/NotIs.kt.after

@@ -0,0 +1,3 @@
+fun foo(arg: Any?) {
+    val n = arg as? Int ?: return
+}

idea/testData/intentions/foldInitializerAndIfToElvis/OtherVar1.kt

@@ -0,0 +1,11 @@
+// IS_APPLICABLE: false
+class C {
+    var v: String? = null
+
+    fun foo(p: List<String?>): Int {
+        val v = p[0]
+        <caret>if (this.v == null) return -1
+        return v!!.length
+    }
+}
+

idea/testData/intentions/foldInitializerAndIfToElvis/OtherVar2.kt

@@ -0,0 +1,11 @@
+// IS_APPLICABLE: false
+class C {
+    var x: String? = null
+
+    fun foo(p: List<String?>): Int {
+        val v = p[0]
+        <caret>if (x == null) return -1
+        return v!!.length
+    }
+}
+

idea/testData/intentions/foldInitializerAndIfToElvis/Return.kt

@@ -0,0 +1,5 @@
+fun foo(p: List<String?>): Int {
+    val v = p[0]
+    <caret>if (v == null) return -1
+    return v.length
+}

idea/testData/intentions/foldInitializerAndIfToElvis/Return.kt.after

@@ -0,0 +1,4 @@
+fun foo(p: List<String?>): Int {
+    val v = p[0] ?: <caret>return -1
+    return v.length
+}

idea/testData/intentions/foldInitializerAndIfToElvis/ThrowInBlock.kt

@@ -0,0 +1,8 @@
+// WITH_RUNTIME
+
+fun foo(p: List<String?>) {
+    val v = p[0]
+    <caret>if (v == null) {
+        throw RuntimeException()
+    }
+}

idea/testData/intentions/foldInitializerAndIfToElvis/ThrowInBlock.kt.after

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+
+fun foo(p: List<String?>) {
+    val v = p[0] ?: <caret>throw RuntimeException()
+}

idea/testData/intentions/foldInitializerAndIfToElvis/Var.kt

@@ -0,0 +1,5 @@
+fun foo(p: List<String?>, b: Boolean) {
+    var v = p[0]
+    <caret>if (v == null) return
+    if (b) v = null
+}

idea/testData/intentions/foldInitializerAndIfToElvis/Var.kt.after

@@ -0,0 +1,4 @@
+fun foo(p: List<String?>, b: Boolean) {
+    var v: String? = p[0] ?: <caret>return
+    if (b) v = null
+}

idea/testData/intentions/foldInitializerAndIfToElvis/ifStatementPriority.kt

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+fun test(a: String?, b: String): String {
+    val x = if (true) a else b
+    <caret>if (x == null) throw Exception()
+    return x
+}

idea/testData/intentions/foldInitializerAndIfToElvis/ifStatementPriority.kt.after

@@ -0,0 +1,5 @@
+// WITH_RUNTIME
+fun test(a: String?, b: String): String {
+    val x = (if (true) a else b) ?: throw Exception()
+    return x
+}