From 2c17773715f3ce1be0fa227382bfe068569f08bc Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 26 Jan 2017 15:22:39 +0300 Subject: [PATCH] Minor: better name --- .../kotlin/idea/debugger/DebuggerClassNameProvider.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt index 1d0d7248edb..f869c34347d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt @@ -154,7 +154,7 @@ class DebuggerClassNameProvider(val myDebugProcess: DebugProcess, val scopes: Li val descriptor = typeMapper.bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element) val parentInternalName = when { - isSuspendDescriptor(descriptor, typeMapper.bindingContext) -> { + isFunctionWithSuspendStateMachine(descriptor, typeMapper.bindingContext) -> { CodegenBinding.asmTypeForAnonymousClass(typeMapper.bindingContext, element).internalName } elementOfClassName is KtClassOrObject -> getClassNameForClass(elementOfClassName, typeMapper) @@ -180,7 +180,7 @@ class DebuggerClassNameProvider(val myDebugProcess: DebugProcess, val scopes: Li return CachedClassNames(getClassNameForFile(file)) } - private fun isSuspendDescriptor(descriptor: DeclarationDescriptor?, bindingContext: BindingContext): Boolean { + private fun isFunctionWithSuspendStateMachine(descriptor: DeclarationDescriptor?, bindingContext: BindingContext): Boolean { return descriptor is SimpleFunctionDescriptor && descriptor.isSuspend && descriptor.containsNonTailSuspensionCalls(bindingContext) } @@ -223,7 +223,7 @@ class DebuggerClassNameProvider(val myDebugProcess: DebugProcess, val scopes: Li val ownerDescriptor = lexicalScope.ownerDescriptor - val className = if (isSuspendDescriptor(ownerDescriptor, typeMapper.bindingContext)) { + val className = if (isFunctionWithSuspendStateMachine(ownerDescriptor, typeMapper.bindingContext)) { originalInternalClassName.replaceAfterLast("$", DO_RESUME_METHOD_NAME) } else {