Added safeAccessToIfThen intention

idea/testData/intentions/branched/safeAccessToIfThen/binaryExpressionLhs.kt

@@ -0,0 +1,5 @@
+fun main(args: Array<String>) {
+    val x: String? = null
+    val y: String? = "Hello"
+    val z = (x ?: y)?.<caret>length
+}

idea/testData/intentions/branched/safeAccessToIfThen/binaryExpressionLhs.kt.after

@@ -0,0 +1,6 @@
+fun main(args: Array<String>) {
+    val x: String? = null
+    val y: String? = "Hello"
+    val s = x ?: y
+    val z = if (s != null) s.length else null
+}

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

@@ -0,0 +1,4 @@
+fun foo(): String? = "foo"
+fun main(args: Array<String>) {
+    foo()?.<caret>length()
+}

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

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

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

@@ -0,0 +1,4 @@
+fun foo(): String? = "foo"
+fun main(args: Array<String>) {
+    (foo())?.<caret>length()
+}

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

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

idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt

@@ -0,0 +1,11 @@
+class Foo {
+    val b: String?
+        get() {
+            print("I have side effects")
+            return "Foo"
+        }
+}
+fun main(args: Array<String>) {
+    val a = Foo()
+    println(a.b?.<caret>length)
+}

idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after

@@ -0,0 +1,12 @@
+class Foo {
+    val b: String?
+        get() {
+            print("I have side effects")
+            return "Foo"
+        }
+}
+fun main(args: Array<String>) {
+    val a = Foo()
+    val s = a.b
+    println(if (s != null) s.length else null)
+}

idea/testData/intentions/branched/safeAccessToIfThen/localValAsReceiver.kt

@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    val x: String? = "abc"
+    x?.<caret>length
+}

idea/testData/intentions/branched/safeAccessToIfThen/localValAsReceiver.kt.after

@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    val x: String? = "abc"
+    if (x != null) x.length
+}

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

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

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

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

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

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

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

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

idea/testData/intentions/branched/safeAccessToIfThen/resultAssignedToLocalVal.kt

@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    val x: String? = "abc"
+    val y = x?.<caret>length
+}

idea/testData/intentions/branched/safeAccessToIfThen/resultAssignedToLocalVal.kt.after

@@ -0,0 +1,4 @@
+fun main(args: Array<String>) {
+    val x: String? = "abc"
+    val y = if (x != null) x.length else null
+}

idea/testData/intentions/branched/safeAccessToIfThen/safeAccessAsFunctionArgument.kt

@@ -0,0 +1,8 @@
+fun f(s: Int?) {
+    println(s)
+}
+
+fun main(args: Array<String>) {
+    val x: String? = "foo"
+    f(x?.<caret>length)
+}

idea/testData/intentions/branched/safeAccessToIfThen/safeAccessAsFunctionArgument.kt.after

@@ -0,0 +1,8 @@
+fun f(s: Int?) {
+    println(s)
+}
+
+fun main(args: Array<String>) {
+    val x: String? = "foo"
+    f(if (x != null) x.length else null)
+}

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

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

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

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

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

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

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

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

idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver.kt

@@ -0,0 +1,9 @@
+class B {
+    val c = "ab"
+}
+
+fun main(args: Array<String>) {
+    val a: B? = B()
+    val x = a?.<caret>c
+}
+

idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver.kt.after

@@ -0,0 +1,9 @@
+class B {
+    val c = "ab"
+}
+
+fun main(args: Array<String>) {
+    val a: B? = B()
+    val x = if (a != null) a.c else null
+}
+

idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver2.kt

@@ -0,0 +1,13 @@
+class B {
+    val c = C()
+}
+
+class C {
+    val d = "bc"
+}
+
+fun main(args: Array<String>) {
+    val a: B? = B()
+    val x = a<caret>?.c?.d
+}
+

idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver2.kt.after

@@ -0,0 +1,13 @@
+class B {
+    val c = C()
+}
+
+class C {
+    val d = "bc"
+}
+
+fun main(args: Array<String>) {
+    val a: B? = B()
+    val x = (if (a != null) a.c else null)?.d
+}
+

idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver3.kt

@@ -0,0 +1,12 @@
+class B {
+    val c = C()
+}
+
+class C {
+    val d = "bc"
+}
+
+fun main(args: Array<String>) {
+    val a: B? = B()
+    val x = a?.c?.<caret>d
+}

idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver3.kt.after

@@ -0,0 +1,12 @@
+class B {
+    val c = C()
+}
+
+class C {
+    val d = "bc"
+}
+
+fun main(args: Array<String>) {
+    val a: B? = B()
+    val x = if (a?.c != null) a?.c.d else null
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

idea/testData/intentions/branched/safeAccessToIfThen/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.length
+}

idea/testData/intentions/branched/safeAccessToIfThen/usedAsFunctionRhs.kt

@@ -0,0 +1,4 @@
+fun foo(arg: String?): Int? = arg?.<caret>length
+fun main(args: Array<String>) {
+    foo("bar")
+}

idea/testData/intentions/branched/safeAccessToIfThen/usedAsFunctionRhs.kt.after

@@ -0,0 +1,4 @@
+fun foo(arg: String?): Int? = if (arg != null) arg.length else null
+fun main(args: Array<String>) {
+    foo("bar")
+}

idea/testData/intentions/branched/safeAccessToIfThen/usedAsResultOfCheckedIf.kt

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

idea/testData/intentions/branched/safeAccessToIfThen/usedAsResultOfCheckedIf.kt.after

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

idea/testData/intentions/branched/safeAccessToIfThen/usedAsReturnValue.kt

@@ -0,0 +1,7 @@
+fun doSth(): String? {
+    val x?: String = "abc"
+    return x?.<caret>reverse()
+}
+fun main(args: Array<String>) {
+    val y = doSth()
+}

idea/testData/intentions/branched/safeAccessToIfThen/usedAsReturnValue.kt.after

@@ -0,0 +1,7 @@
+fun doSth(): String? {
+    val x?: String = "abc"
+    return if (x != null) x.reverse() else null
+}
+fun main(args: Array<String>) {
+    val y = doSth()
+}

idea/testData/intentions/branched/safeAccessToIfThen/usedInUncheckedIfExpression.kt

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

idea/testData/intentions/branched/safeAccessToIfThen/usedInUncheckedIfExpression.kt.after

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

idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt

@@ -1,6 +1,9 @@
 // "class com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase" "false"
 // ERROR: Unresolved reference: SomeTest
+// ACTION: Edit intention settings
+// ACTION: Replace safe access expression with 'if' expression
+// ACTION: Disable 'Replace Safe Access Expression With 'if' Expression'
 
 package testing
 
-val x = testing?.<caret>SomeTest()
+val x = testing?.<caret>SomeTest()