Replace deprecated symbol usage: replace imported object function correctly

#KT-33951 Fixed

idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeToInlineBuilder.kt

@@ -36,6 +36,7 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitReceiver
 import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier
 import org.jetbrains.kotlin.types.ErrorUtils
 import org.jetbrains.kotlin.types.KotlinType
+import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 import org.jetbrains.kotlin.utils.sure
 import java.util.*
 
@@ -175,10 +176,12 @@ class CodeToInlineBuilder(
             }
 
             if (expression.getReceiverExpression() == null) {
-                if (target is ValueParameterDescriptor && target.containingDeclaration == targetCallable) {
+                (targetCallable.safeAs<ImportedFromObjectCallableDescriptor<*>>()?.callableFromObject ?: targetCallable).let {
-                    expression.putCopyableUserData(CodeToInline.PARAMETER_USAGE_KEY, target.name)
+                    if (target is ValueParameterDescriptor && target.containingDeclaration == it) {
-                } else if (target is TypeParameterDescriptor && target.containingDeclaration == targetCallable) {
+                        expression.putCopyableUserData(CodeToInline.PARAMETER_USAGE_KEY, target.name)
-                    expression.putCopyableUserData(CodeToInline.TYPE_PARAMETER_USAGE_KEY, target.name)
+                    } else if (target is TypeParameterDescriptor && target.containingDeclaration == it) {
+                        expression.putCopyableUserData(CodeToInline.TYPE_PARAMETER_USAGE_KEY, target.name)
+                    }
                 }
 
                 if (targetCallable !is ImportedFromObjectCallableDescriptor<*>) {

idea/testData/quickfix/deprecatedSymbolUsage/importedObjectFunctionAddReceiver.kt

@@ -0,0 +1,13 @@
+// "Replace with 'str.isEmpty()'" "true"
+// WITH_RUNTIME
+
+import Bar.bar
+
+fun foo(s: String) {
+    <caret>bar(s)
+}
+
+object Bar {
+    @Deprecated(message = "", replaceWith = ReplaceWith("str.isEmpty()"))
+    fun bar(str: String): Boolean = str.isEmpty()
+}

idea/testData/quickfix/deprecatedSymbolUsage/importedObjectFunctionAddReceiver.kt.after

@@ -0,0 +1,13 @@
+// "Replace with 'str.isEmpty()'" "true"
+// WITH_RUNTIME
+
+import Bar.bar
+
+fun foo(s: String) {
+    s.isEmpty()
+}
+
+object Bar {
+    @Deprecated(message = "", replaceWith = ReplaceWith("str.isEmpty()"))
+    fun bar(str: String): Boolean = str.isEmpty()
+}

idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java

@@ -6150,6 +6150,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             runTest("idea/testData/quickfix/deprecatedSymbolUsage/importedObjectFunction.kt");
         }
 
+        @TestMetadata("importedObjectFunctionAddReceiver.kt")
+        public void testImportedObjectFunctionAddReceiver() throws Exception {
+            runTest("idea/testData/quickfix/deprecatedSymbolUsage/importedObjectFunctionAddReceiver.kt");
+        }
+
         @TestMetadata("importedObjectProperty.kt")
         public void testImportedObjectProperty() throws Exception {
             runTest("idea/testData/quickfix/deprecatedSymbolUsage/importedObjectProperty.kt");