Inline fun: remove recursion inside includesCallOf

Probably #KT-17330 Fixed
2017-04-14 15:55:13 +03:00
parent a87da4338f
commit ade838bff2
1 changed files with 3 additions and 2 deletions
@@ -133,8 +133,9 @@ class KotlinInlineFunctionHandler: InlineActionHandler() {

    private fun KtExpression.includesCallOf(descriptor: FunctionDescriptor, context: BindingContext): Boolean {
        val refDescriptor = getResolvedCall(context)?.resultingDescriptor
-        return descriptor == refDescriptor ||
-               anyDescendantOfType<KtExpression> { it !== this && it.includesCallOf(descriptor, context) }
+        return descriptor == refDescriptor || anyDescendantOfType<KtExpression> {
+                   it !== this && descriptor == it.getResolvedCall(context)?.resultingDescriptor
+               }
    }

 }