azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If the last argument of a function is a suspend function,

Browse Source 
suggest trailing lambda variant in completion.
This commit is contained in:
Dmitry Petrov
2016-12-15 16:00:22 +03:00
committed by Stanislav Erokhin
parent f9d550732e
commit 8e3fd0efc3
5 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/util/functionTypeResolveUtils.kt
+4 -4
View File
@@ -16,8 +16,8 @@
package org.jetbrains.kotlin.resolve.calls.util
import org.jetbrains.kotlin.builtins.isExtensionFunctionType
import org.jetbrains.kotlin.builtins.isFunctionType
import org.jetbrains.kotlin.builtins.isBuiltinExtensionFunctionalType
import org.jetbrains.kotlin.builtins.isBuiltinFunctionalType
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.SourceElement
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
@@ -43,7 +43,7 @@ fun createValueParametersForInvokeInFunctionType(
}
fun getValueParametersCountFromFunctionType(type: KotlinType): Int {
assert(type.isFunctionType) { "Not a function type: $type" }
assert(type.isBuiltinFunctionalType) { "Not a function type: $type" }
// Function type arguments = receiver? + parameters + return-type
return type.arguments.size - (if (type.isExtensionFunctionType) 1 else 0) - 1
return type.arguments.size - (if (type.isBuiltinExtensionFunctionalType) 1 else 0) - 1
}