More proper code to check if lambda is inlined. Parameter of inline function can be annotated with "noInline".

This commit is contained in:
Evgeny Gerashchenko
2015-04-07 19:56:44 +03:00
parent d24d750d34
commit 015da2f8ca
5 changed files with 42 additions and 6 deletions
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.utils.sure
import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
import org.jetbrains.kotlin.resolve.InlineDescriptorUtils
import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext
// resolved call
@@ -183,9 +184,6 @@ public fun JetExpression.getFunctionResolvedCallWithAssert(context: BindingConte
public fun JetFunctionLiteral.isInlined(bindingContext: BindingContext): Boolean {
val parent = this.getParent()
assert(parent is JetFunctionLiteralExpression) { "parent of JetFunctionLiteral is " + parent }
val resolvedCall = (parent as JetFunctionLiteralExpression).getParentResolvedCall(bindingContext, true)
if (resolvedCall == null) return false
val callable = resolvedCall.getResultingDescriptor()
return callable is SimpleFunctionDescriptor && callable.getInlineStrategy().isInline()
return InlineDescriptorUtils.isInlineLambda(parent as JetFunctionLiteralExpression, bindingContext, false)
}
@@ -88,4 +88,15 @@ fun objectExpression() {
val <info descr="Value captured in a closure">u3</info> = ""
object : Throwable(run { <info descr="Value captured in a closure">u3</info> }) {
}
}
}
inline fun withNoInlineParam(noinline task1: () -> Unit, task2: () -> Unit) {
task1()
task2()
}
fun usage(<info descr="Value captured in a closure">param1</info>: Int, param2: Int) {
withNoInlineParam({ println(<info descr="Value captured in a closure">param1</info>) }, { println(param2) })
}
fun println(<warning>a</warning>: Any) {}
@@ -2,4 +2,13 @@ fun f(a: Int) {
run {
<lineMarker>f</lineMarker>(a - 1)
}
}
}
fun ff(a: Int) {
run1 {
ff(a - 1)
}
}
inline fun <T> run1(noinline f: () -> T): T { }
@@ -0,0 +1,12 @@
fun f(a: Int): Int {
if (a < 5) {
run1(fun (): Int {
<caret>return 1
})
}
return 2
}
inline public fun <T> run1(noinline f: () -> T): T { }
//HIGHLIGHTED: return 1
@@ -60,6 +60,12 @@ public class HighlightExitPointsTestGenerated extends AbstractHighlightExitPoint
doTest(fileName);
}
@TestMetadata("inlineWithNoInlineParam.kt")
public void testInlineWithNoInlineParam() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/inlineWithNoInlineParam.kt");
doTest(fileName);
}
@TestMetadata("localFunction1.kt")
public void testLocalFunction1() throws Exception {
String fileName = JetTestUtils.navigationMetadata("idea/testData/exitPoints/localFunction1.kt");