Added ifThenToElvisIntention

idea/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt

@@ -0,0 +1,13 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo: String? = null
+    val bar = "bar"
+
+    if (foo != null<caret>) {
+        print ("Hello")
+        foo
+    }
+    else {
+        bar
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/blockUsesDifferentVar.kt

@@ -0,0 +1,14 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo = null
+    val a = "a"
+    val b = "b"
+
+    if (foo != null<caret>) {
+        a
+    }
+    else {
+        b
+    }
+
+}

idea/testData/intentions/branched/ifThenToElvis/conditionComparesNullWithNull.kt

@@ -0,0 +1,10 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo: String? = "foo"
+    if (null == <caret>null) {
+        foo
+    }
+    else {
+        null
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/conditionInvalidBinaryExp.kt

@@ -0,0 +1,11 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo = null
+    val bar = "bar"
+    if (foo > null<caret>) {
+        foo
+    }
+    else {
+        bar
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/conditionNotBinaryExpr.kt

@@ -0,0 +1,11 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo: Int? = 4
+    val bar = 3
+    if (foo * 10<caret>) {
+        foo
+    }
+    else {
+        bar
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt

@@ -0,0 +1,15 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    val foo = maybeFoo()
+    print(foo)
+    val bar = "bar"
+    if (foo != null<caret>) {
+        foo
+    }
+    else {
+        bar
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt.after

@@ -0,0 +1,10 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    val foo = maybeFoo()
+    print(foo)
+    val bar = "bar"
+    foo ?: bar
+}

idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueOutsideOfScope.kt

@@ -0,0 +1,13 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+val x = maybeFoo()
+
+fun main(args: Array<String>) {
+    if (x !=<caret> null) {
+        x
+    } else {
+        "abc"
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueOutsideOfScope.kt.after

@@ -0,0 +1,9 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+val x = maybeFoo()
+
+fun main(args: Array<String>) {
+    x ?: "abc"
+}

idea/testData/intentions/branched/ifThenToElvis/emptyCondition.kt

@@ -0,0 +1,12 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo = "foo"
+    val bar = "foo"
+    if (<caret>) {
+        foo
+    }
+    else {
+        bar
+    }
+
+}

idea/testData/intentions/branched/ifThenToElvis/emptyElseBlock.kt

@@ -0,0 +1,10 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo: String? = null
+    if (foo != null<caret>) {
+        foo
+    }
+    else {
+
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/emptyThenBlock.kt

@@ -0,0 +1,10 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo: String? = "foo"
+    val bar = "bar"
+    if (foo == null<caret>) {
+    }
+    else {
+        bar
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/ifAndElseBothInBlocks.kt

@@ -0,0 +1,14 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    val foo = maybeFoo()
+    val bar = "bar"
+    if (foo != null<caret>) {
+        foo
+    }
+    else {
+        bar
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/ifAndElseBothInBlocks.kt.after

@@ -0,0 +1,8 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    val bar = "bar"
+    maybeFoo() ?: bar
+}

idea/testData/intentions/branched/ifThenToElvis/ifAndElseNotInBlocks.kt

@@ -0,0 +1,12 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    val foo = maybeFoo()
+    val bar = "bar"
+    if (foo != null<caret>)
+        foo
+    else
+        bar
+}

idea/testData/intentions/branched/ifThenToElvis/ifAndElseNotInBlocks.kt.after

@@ -0,0 +1,8 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    val bar = "bar"
+    maybeFoo() ?: bar
+}

idea/testData/intentions/branched/ifThenToElvis/ifAsExpression.kt

@@ -0,0 +1,14 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    val foo = maybeFoo()
+    val bar = "bar"
+    val x = if (foo == null<caret>) {
+        bar
+    }
+    else {
+        foo
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/ifAsExpression.kt.after

@@ -0,0 +1,8 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    val bar = "bar"
+    val x = maybeFoo() ?: bar
+}

idea/testData/intentions/branched/ifThenToElvis/lhsEqualsNull.kt

@@ -0,0 +1,12 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    val foo = maybeFoo()
+    val bar = "bar"
+    if (foo == null<caret>)
+        bar
+    else
+        foo
+}

idea/testData/intentions/branched/ifThenToElvis/lhsEqualsNull.kt.after

@@ -0,0 +1,8 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    val bar = "bar"
+    maybeFoo() ?: bar
+}

idea/testData/intentions/branched/ifThenToElvis/lhsNotEqualsNull.kt

@@ -0,0 +1,12 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    val foo = maybeFoo()
+    val bar = "bar"
+    if (foo != null<caret>)
+        foo
+    else
+        bar
+}

idea/testData/intentions/branched/ifThenToElvis/lhsNotEqualsNull.kt.after

@@ -0,0 +1,8 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    val bar = "bar"
+    maybeFoo() ?: bar
+}

idea/testData/intentions/branched/ifThenToElvis/missingElseClause.kt

@@ -0,0 +1,7 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo: String? = "foo"
+    if (foo == null<caret>) {
+        null
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/missingThenClause.kt

@@ -0,0 +1,9 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo: String? = "foo"
+    val bar = "bar"
+    if (foo != null<caret>)
+    else {
+        bar
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/noCondition.kt

@@ -0,0 +1,8 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo: String? = "foo"
+    val bar = "bar"
+    if<caret> {
+        foo
+    } else bar
+}

idea/testData/intentions/branched/ifThenToElvis/noNullInCondition.kt

@@ -0,0 +1,11 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo = "foo"
+    val bar = "bar"
+    if (foo == bar<caret>) {
+        foo
+    }
+    else {
+        bar
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/notApplicableForFunction.kt

@@ -0,0 +1,11 @@
+//IS_APPLICABLE: false
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    if (maybeFoo() == null<caret>)
+        maybeFoo()
+    else
+        "bar"
+}

idea/testData/intentions/branched/ifThenToElvis/notApplicableForLocalVar.kt

@@ -0,0 +1,12 @@
+//IS_APPLICABLE: false
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    var foo = maybeFoo()
+    if (foo == null<caret>)
+        "bar"
+    else
+        foo
+}

idea/testData/intentions/branched/ifThenToElvis/nullBranchAlsoNull.kt

@@ -0,0 +1,10 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo: String? = "foo"
+    if (foo == null<caret>) {
+        null
+    }
+    else {
+        foo
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt

@@ -0,0 +1,13 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo: String? = null
+    val bar = "bar"
+
+    if (foo != null<caret>) {
+        foo
+    }
+    else {
+        print ("Hello")
+        bar
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/rhsEqualsNull.kt

@@ -0,0 +1,12 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    val bar = "bar"
+    val foo = maybeFoo()
+    if (null == foo<caret>)
+        bar
+    else
+        foo
+}

idea/testData/intentions/branched/ifThenToElvis/rhsEqualsNull.kt.after

@@ -0,0 +1,8 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    val bar = "bar"
+    maybeFoo() ?: bar
+}

idea/testData/intentions/branched/ifThenToElvis/rhsNotEqualsNull.kt

@@ -0,0 +1,13 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun bar(): String = "bar"
+
+fun main(args: Array<String>) {
+    val foo = maybeFoo()
+    if (null != foo<caret>)
+        foo
+    else
+        bar()
+}

idea/testData/intentions/branched/ifThenToElvis/rhsNotEqualsNull.kt.after

@@ -0,0 +1,9 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun bar(): String = "bar"
+
+fun main(args: Array<String>) {
+    maybeFoo() ?: bar()
+}

idea/testData/intentions/branched/ifThenToElvis/thenAndElseBothNull.kt

@@ -0,0 +1,10 @@
+// IS_APPLICABLE: false
+fun main(args: Array<String>) {
+    val foo = null
+    if (foo == null<caret>) {
+        null
+    }
+    else {
+        null
+    }
+}

idea/testData/intentions/branched/ifThenToElvis/willNotInlineClassProperty.kt

@@ -0,0 +1,8 @@
+class F(a: Int?) {
+    val b = a
+    val c = if (b !=<caret> null) b else 2
+}
+
+fun main(args: Array<String>) {
+    F(1).c
+}

idea/testData/intentions/branched/ifThenToElvis/willNotInlineClassProperty.kt.after

@@ -0,0 +1,8 @@
+class F(a: Int?) {
+    val b = a
+    val c = b ?: 2
+}
+
+fun main(args: Array<String>) {
+    F(1).c
+}