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

Inline fun: remove recursion inside includesCallOf

Browse Source 
Probably #KT-17330 Fixed
This commit is contained in:
Mikhail Glukhikh
2017-04-14 15:55:13 +03:00
parent a87da4338f
commit ade838bff2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineFunctionHandler.kt
+3 -2
View File
@@ -133,8 +133,9 @@ class KotlinInlineFunctionHandler: InlineActionHandler() {
private fun KtExpression.includesCallOf(descriptor: FunctionDescriptor, context: BindingContext): Boolean { private fun KtExpression.includesCallOf(descriptor: FunctionDescriptor, context: BindingContext): Boolean {
val refDescriptor = getResolvedCall(context)?.resultingDescriptor val refDescriptor = getResolvedCall(context)?.resultingDescriptor
return descriptor == refDescriptor || return descriptor == refDescriptor || anyDescendantOfType<KtExpression> {
anyDescendantOfType<KtExpression> { it !== this && it.includesCallOf(descriptor, context) } it !== this && descriptor == it.getResolvedCall(context)?.resultingDescriptor
}
} }
} }