Added elvisToIfThenIntention

idea/testData/intentions/branched/elvisToIfThen/callExpression.kt

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

idea/testData/intentions/branched/elvisToIfThen/callExpression.kt.after

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

idea/testData/intentions/branched/elvisToIfThen/callExpressionParens.kt

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

idea/testData/intentions/branched/elvisToIfThen/callExpressionParens.kt.after

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

idea/testData/intentions/branched/elvisToIfThen/elvisAsExpression.kt

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

idea/testData/intentions/branched/elvisToIfThen/elvisAsExpression.kt.after

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

idea/testData/intentions/branched/elvisToIfThen/localValLhs.kt

@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    val a: String? = "A"
+    a ?:<caret> "bar"
+}

idea/testData/intentions/branched/elvisToIfThen/localValLhs.kt.after

@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    val a: String? = "A"
+    if (a != null) a else "bar"
+}

idea/testData/intentions/branched/elvisToIfThen/localVarLhs.kt

@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    var a: String? = "A"
+    a ?:<caret> "bar"
+}

idea/testData/intentions/branched/elvisToIfThen/localVarLhs.kt.after

@@ -0,0 +1,5 @@
+fun main(args: Array<String>) {
+    var a: String? = "A"
+    val s = a
+    if (s != null) s else "bar"
+}

idea/testData/intentions/branched/elvisToIfThen/simpleNameExpression.kt

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

idea/testData/intentions/branched/elvisToIfThen/simpleNameExpression.kt.after

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

idea/testData/intentions/branched/elvisToIfThen/simpleNameExpressionInParens.kt

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

idea/testData/intentions/branched/elvisToIfThen/simpleNameExpressionInParens.kt.after

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

idea/testData/intentions/branched/elvisToIfThen/topLevelVal.kt

@@ -0,0 +1,4 @@
+val a: String? = "A"
+fun main(args: Array<String>) {
+    a ?:<caret> "bar"
+}

idea/testData/intentions/branched/elvisToIfThen/topLevelVal.kt.after

@@ -0,0 +1,4 @@
+val a: String? = "A"
+fun main(args: Array<String>) {
+    if (a != null) a else "bar"
+}

idea/testData/intentions/branched/elvisToIfThen/topLevelValCustomGetter.kt

@@ -0,0 +1,6 @@
+val a: String?
+    get() = ""
+
+fun main(args: Array<String>) {
+    a <caret>?: "bar"
+}

idea/testData/intentions/branched/elvisToIfThen/topLevelValCustomGetter.kt.after

@@ -0,0 +1,7 @@
+val a: String?
+    get() = ""
+
+fun main(args: Array<String>) {
+    val s = a
+    if (s != null) s else "bar"
+}

idea/testData/intentions/branched/elvisToIfThen/topLevelVar.kt

@@ -0,0 +1,4 @@
+var a: String? = "A"
+fun main(args: Array<String>) {
+    a <caret>?: "bar"
+}

idea/testData/intentions/branched/elvisToIfThen/topLevelVar.kt.after

@@ -0,0 +1,5 @@
+var a: String? = "A"
+fun main(args: Array<String>) {
+    val s = a
+    if (s != null) s else "bar"
+}

idea/testData/intentions/branched/elvisToIfThen/topLevelVarCustomGetter.kt

@@ -0,0 +1,7 @@
+var a: String?
+    get() = ""
+    set(v) {}
+
+fun main(args: Array<String>) {
+    a ?:<caret> "bar"
+}

idea/testData/intentions/branched/elvisToIfThen/topLevelVarCustomGetter.kt.after

@@ -0,0 +1,8 @@
+var a: String?
+    get() = ""
+    set(v) {}
+
+fun main(args: Array<String>) {
+    val s = a
+    if (s != null) s else "bar"
+}