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

Minor: extract variable

Browse Source
This commit is contained in:
Nikolay Krasko
2017-03-03 15:43:07 +03:00
parent 52d11eb22b
commit b240ae791c
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt
+19 -16
View File
@@ -191,27 +191,30 @@ class DebuggerClassNameProvider(val myDebugProcess: DebugProcess, val scopes: Li
val context = typeMapper.bindingContext val context = typeMapper.bindingContext
val inlineCall = runReadAction { val inlineCall = runReadAction {
element.parents.map { val parentCallsWithLambdas = element.parents.map {
val ktCallExpression: KtCallExpression = when(it) { val ktCallExpression: KtCallExpression =
is KtFunctionLiteral -> { when (it) {
val lambdaExpression = it.parent as? KtLambdaExpression is KtFunctionLiteral -> {
// call(param, { <it> }) val lambdaExpression = it.parent as? KtLambdaExpression
lambdaExpression?.typedParent<KtValueArgument>()?.typedParent<KtValueArgumentList>()?.typedParent<KtCallExpression>() ?: // call(param, { <it> })
lambdaExpression?.typedParent<KtValueArgument>()?.typedParent<KtValueArgumentList>()?.typedParent<KtCallExpression>() ?:
// call { <it> } // call { <it> }
lambdaExpression?.typedParent<KtLambdaArgument>()?.typedParent<KtCallExpression>() lambdaExpression?.typedParent<KtLambdaArgument>()?.typedParent<KtCallExpression>()
} }
is KtNamedFunction -> { is KtNamedFunction -> {
// call(fun () {}) // call(fun () {})
it.typedParent<KtValueArgument>()?.typedParent<KtValueArgumentList>()?.typedParent<KtCallExpression>() it.typedParent<KtValueArgument>()?.typedParent<KtValueArgumentList>()?.typedParent<KtCallExpression>()
} }
else -> null else -> null
} ?: return@map null } ?: return@map null
ktCallExpression to (it as KtElement) ktCallExpression to (it as KtElement)
}.lastOrNull { }.toList()
parentCallsWithLambdas.lastOrNull {
it != null && isInlineCall(context, it.component1()) it != null && isInlineCall(context, it.component1())
}?.first }?.first
} ?: return emptyList() } ?: return emptyList()