In progress: KT-7442 Inspection + intention to replace "if (xxx == null) return ..' with elvis

idea/testData/intentions/ifNullToElvis/.intention

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

idea/testData/intentions/ifNullToElvis/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/ifNullToElvis/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/ifNullToElvis/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/ifNullToElvis/CommentInBlock.kt.after

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

idea/testData/intentions/ifNullToElvis/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/ifNullToElvis/Comments.kt.after

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

idea/testData/intentions/ifNullToElvis/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/ifNullToElvis/Comments2.kt.after

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

idea/testData/intentions/ifNullToElvis/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/ifNullToElvis/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/ifNullToElvis/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/ifNullToElvis/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/ifNullToElvis/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/ifNullToElvis/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/ifNullToElvis/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/ifNullToElvis/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/ifNullToElvis/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/ifNullToElvis/ThrowInBlock.kt.after

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