Convert receiver to parameter: place value argument list after type argument list

#KT-41499 Fixed

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt

@@ -77,8 +77,9 @@ class KotlinFunctionCallUsage(
         changeNameIfNeeded(changeInfo, element)
 
         if (element.valueArgumentList == null && changeInfo.isParameterSetOrOrderChanged && element.lambdaArguments.isNotEmpty()) {
-            element.calleeExpression?.let {
-                element.addAfter(KtPsiFactory(element).createCallArguments("()"), it)
+            val anchor = element.typeArgumentList ?: element.calleeExpression
+            if (anchor != null) {
+                element.addAfter(KtPsiFactory(element).createCallArguments("()"), anchor)
             }
         }
         if (element.valueArgumentList != null) {

idea/testData/intentions/convertReceiverToParameter/usedWithTypeArgumentAndLambdaArgument.kt

@@ -0,0 +1,5 @@
+fun <T> <caret>Any.foo(callback: () -> Unit) {}
+
+fun bar() {
+    "".foo<Int> {}
+}

idea/testData/intentions/convertReceiverToParameter/usedWithTypeArgumentAndLambdaArgument.kt.after

@@ -0,0 +1,5 @@
+fun <T> foo(any: Any, callback: () -> Unit) {}
+
+fun bar() {
+    foo<Int>("") {}
+}

idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java

@@ -6472,6 +6472,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             runTest("idea/testData/intentions/convertReceiverToParameter/usedInAnonymousObject.kt");
         }
 
+        @TestMetadata("usedWithTypeArgumentAndLambdaArgument.kt")
+        public void testUsedWithTypeArgumentAndLambdaArgument() throws Exception {
+            runTest("idea/testData/intentions/convertReceiverToParameter/usedWithTypeArgumentAndLambdaArgument.kt");
+        }
+
         @TestMetadata("validOverload.kt")
         public void testValidOverload() throws Exception {
             runTest("idea/testData/intentions/convertReceiverToParameter/validOverload.kt");