Extract Function: Add support of property-as-function calls

#KT-5179 Fixed

idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt

@@ -45,6 +45,7 @@ import org.jetbrains.jet.lang.psi.psiUtil.getParentByType
 import org.jetbrains.jet.lang.psi.JetDeclaration
 import org.jetbrains.jet.lang.psi.JetDeclarationWithBody
 import org.jetbrains.jet.lang.psi.JetUserType
+import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall
 
 data class ExtractionOptions(val inferUnitTypeForUnusedValues: Boolean) {
     class object {
@@ -102,7 +103,9 @@ class ExtractionData(
                 if (ref !is JetSimpleNameExpression) continue
 
                 val resolvedCallKey = (ref.getParent() as? JetThisExpression) ?: ref
-                val resolvedCall = context[BindingContext.RESOLVED_CALL, resolvedCallKey]
+                val resolvedCall = context[BindingContext.RESOLVED_CALL, resolvedCallKey]?.let {
+                    (it as? VariableAsFunctionResolvedCall)?.functionCall ?: it
+                }
 
                 val descriptor = context[BindingContext.REFERENCE_TARGET, ref]
                 if (descriptor == null) continue

idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractFunctionUtils.kt

@@ -379,15 +379,10 @@ private fun ExtractionData.inferParametersInfo(
 
             val extractParameter = extractThis || extractLocalVar
             if (extractParameter) {
-                val parameterType =
+                val parameterType = when {
-                        if (hasThisReceiver) {
+                    receiver.exists() -> receiver.getType()
-                            when (descriptorToExtract) {
+                    else -> bindingContext[BindingContext.EXPRESSION_TYPE, originalRef] ?: DEFAULT_PARAMETER_TYPE
-                                is ClassDescriptor -> descriptorToExtract.getDefaultType()
+                }
-                                is CallableDescriptor -> descriptorToExtract.getReceiverParameter()?.getType()
-                                else -> null
-                            } ?: DEFAULT_PARAMETER_TYPE
-                        }
-                        else bindingContext[BindingContext.EXPRESSION_TYPE, originalRef] ?: DEFAULT_PARAMETER_TYPE
 
                 if (!parameterType.processTypeIfExtractable(bindingContext, typeParameters, nonDenotableTypes)) continue
 

idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt

@@ -0,0 +1,9 @@
+// PARAM_TYPES: A
+class A {
+    fun invoke() = 20
+}
+// SIBLING:
+fun testProp() {
+    val foo = A()
+    <selection>foo()</selection>
+}

idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt.after

@@ -0,0 +1,13 @@
+// PARAM_TYPES: A
+class A {
+    fun invoke() = 20
+}
+// SIBLING:
+fun testProp() {
+    val foo = A()
+    unit(foo)
+}
+
+fun unit(foo: A) {
+    foo()
+}

idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java

@@ -794,6 +794,11 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                     doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt");
                 }
                 
+                @TestMetadata("variableAsFunction.kt")
+                public void testVariableAsFunction() throws Exception {
+                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt");
+                }
+                
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes")