if-then to safe access: fix for qualified 'this' condition #KT-26662 Fixed

idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt

@@ -228,7 +228,7 @@ data class IfThenToSelectData(
                         else -> error("Illegal state")
                     }
                 }
-                hasImplicitReceiverReplaceableBySafeCall() -> factory.createExpressionByPattern("this?.$0", baseClause).insertSafeCalls(factory)
+                hasImplicitReceiverReplaceableBySafeCall() -> factory.createExpressionByPattern("$0?.$1", receiverExpression, baseClause).insertSafeCalls(factory)
                 baseClause is KtCallExpression -> baseClause.replaceCallWithLet(receiverExpression, factory)
                 else -> baseClause.insertSafeCalls(factory)
             }

idea/testData/inspectionsLocal/branched/ifThenToSafeAccess/implicitReceiver2.kt

@@ -0,0 +1,9 @@
+class Foo {
+    fun foo() {}
+}
+
+fun Foo?.test() {
+    <caret>if (this@test != null) {
+        foo()
+    }
+}

idea/testData/inspectionsLocal/branched/ifThenToSafeAccess/implicitReceiver2.kt.after

@@ -0,0 +1,7 @@
+class Foo {
+    fun foo() {}
+}
+
+fun Foo?.test() {
+    this@test?.foo()
+}

idea/testData/inspectionsLocal/branched/ifThenToSafeAccess/implicitReceiver3.kt

@@ -0,0 +1,10 @@
+class Foo
+
+class Bar {
+    fun Foo?.test() {
+        <caret>if (this@Bar != null) {
+            bar()
+        }
+    }
+    fun bar() {}
+}

idea/testData/inspectionsLocal/branched/ifThenToSafeAccess/implicitReceiver3.kt.after

@@ -0,0 +1,8 @@
+class Foo
+
+class Bar {
+    fun Foo?.test() {
+        this@Bar?.bar()
+    }
+    fun bar() {}
+}

idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java

@@ -166,6 +166,16 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
                 runTest("idea/testData/inspectionsLocal/branched/ifThenToSafeAccess/implicitReceiver.kt");
             }
 
+            @TestMetadata("implicitReceiver2.kt")
+            public void testImplicitReceiver2() throws Exception {
+                runTest("idea/testData/inspectionsLocal/branched/ifThenToSafeAccess/implicitReceiver2.kt");
+            }
+
+            @TestMetadata("implicitReceiver3.kt")
+            public void testImplicitReceiver3() throws Exception {
+                runTest("idea/testData/inspectionsLocal/branched/ifThenToSafeAccess/implicitReceiver3.kt");
+            }
+
             @TestMetadata("implicitReceiverInApply.kt")
             public void testImplicitReceiverInApply() throws Exception {
                 runTest("idea/testData/inspectionsLocal/branched/ifThenToSafeAccess/implicitReceiverInApply.kt");