From ade838bff22f65c9b3484b4bf2395a0f3e22f17c Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Fri, 14 Apr 2017 15:55:13 +0300
Subject: [PATCH] Inline fun: remove recursion inside includesCallOf

Probably #KT-17330 Fixed
---
 .../idea/refactoring/inline/KotlinInlineFunctionHandler.kt   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
index 74e21212271..d3f85f53726 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
@@ -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
+               }
     }
 
 }
\ No newline at end of file