Added ifThenToSafeAccessIntention

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

idea/testData/intentions/branched/ifThenToSafeAccess/emptyElseBlock.kt.after

@@ -0,0 +1,7 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    maybeFoo()?.length
+}

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

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

idea/testData/intentions/branched/ifThenToSafeAccess/emptyThenBlock.kt.after

@@ -0,0 +1,7 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    maybeFoo()?.length()
+}

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

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

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

@@ -0,0 +1,7 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    maybeFoo()?.length()
+}

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

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

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

@@ -0,0 +1,7 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    maybeFoo()?.length()
+}

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

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

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

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

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

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

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

@@ -0,0 +1,7 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    maybeFoo()?.length()
+}

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

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

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

@@ -0,0 +1,7 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    maybeFoo()?.length()
+}

idea/testData/intentions/branched/ifThenToSafeAccess/missingNecessaryElseClause.kt

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

idea/testData/intentions/branched/ifThenToSafeAccess/missingNecessaryThenClause.kt

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

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

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

idea/testData/intentions/branched/ifThenToSafeAccess/noElseBlock.kt

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

idea/testData/intentions/branched/ifThenToSafeAccess/noElseBlock.kt.after

@@ -0,0 +1,7 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    maybeFoo()?.length()
+}

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

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

idea/testData/intentions/branched/ifThenToSafeAccess/noNullInCondition2.kt

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

idea/testData/intentions/branched/ifThenToSafeAccess/noThenBlock.kt

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

idea/testData/intentions/branched/ifThenToSafeAccess/noThenBlock.kt.after

@@ -0,0 +1,7 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    maybeFoo()?.length()
+}

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

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

idea/testData/intentions/branched/ifThenToSafeAccess/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>)
+        null
+    else
+        foo.length()
+}

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

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

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

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

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

@@ -0,0 +1,7 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    maybeFoo()?.length()
+}

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

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

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

@@ -0,0 +1,7 @@
+fun maybeFoo(): String? {
+    return "foo"
+}
+
+fun main(args: Array<String>) {
+    maybeFoo()?.length()
+}

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

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

idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseNotNull.kt

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

idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableEmptyElseBlock.kt

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

idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableEmptyThenBlock.kt

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

idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableNoElseBlock.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/ifThenToSafeAccess/unacceptableNoThenBlock.kt

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

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

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

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

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