"Convert to 'also'" intention: Fix for call expression has this receiver #KT-26009 Fixed

idea/src/org/jetbrains/kotlin/idea/inspections/ScopeFunctionConversionInspection.kt

@@ -209,8 +209,10 @@ class ConvertScopeFunctionToParameter(counterpartName: String) : ConvertScopeFun
                 if (dispatchReceiverTarget == lambdaDescriptor || extensionReceiverTarget == lambdaDescriptor) {
                     val parent = expression.parent
                     if (parent is KtCallExpression && expression == parent.calleeExpression) {
-                        replacements.add(parent) { element ->
-                            factory.createExpressionByPattern("$0.$1", parameterName, element)
+                        if ((parent.parent as? KtQualifiedExpression)?.receiverExpression !is KtThisExpression) {
+                            replacements.add(parent) { element ->
+                                factory.createExpressionByPattern("$0.$1", parameterName, element)
+                            }
                         }
                     } else if (parent is KtQualifiedExpression && parent.receiverExpression is KtThisExpression) {
                         // do nothing

idea/testData/inspectionsLocal/scopeFunctions/applyToAlso/methodWithThis.kt

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+// FIX: Convert to 'also'
+
+val x = hashSetOf<String>().<caret>apply {
+    this.add("x")
+}

idea/testData/inspectionsLocal/scopeFunctions/applyToAlso/methodWithThis.kt.after

@@ -0,0 +1,6 @@
+// WITH_RUNTIME
+// FIX: Convert to 'also'
+
+val x = hashSetOf<String>().<caret>also {
+    it.add("x")
+}

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

@@ -5410,6 +5410,11 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
                 runTest("idea/testData/inspectionsLocal/scopeFunctions/applyToAlso/method.kt");
             }
 
+            @TestMetadata("methodWithThis.kt")
+            public void testMethodWithThis() throws Exception {
+                runTest("idea/testData/inspectionsLocal/scopeFunctions/applyToAlso/methodWithThis.kt");
+            }
+
             @TestMetadata("outerLambda.kt")
             public void testOuterLambda() throws Exception {
                 runTest("idea/testData/inspectionsLocal/scopeFunctions/applyToAlso/outerLambda.kt");