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

Minor: better name

Browse Source
This commit is contained in:
Nikolay Krasko
2017-01-26 15:22:39 +03:00
parent 370e7cd9f5
commit 2c17773715
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/DebuggerClassNameProvider.kt
+3 -3
View File
@@ -154,7 +154,7 @@ class DebuggerClassNameProvider(val myDebugProcess: DebugProcess, val scopes: Li
val descriptor = typeMapper.bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element) val descriptor = typeMapper.bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element)
val parentInternalName = when { val parentInternalName = when {
isSuspendDescriptor(descriptor, typeMapper.bindingContext) -> { isFunctionWithSuspendStateMachine(descriptor, typeMapper.bindingContext) -> {
CodegenBinding.asmTypeForAnonymousClass(typeMapper.bindingContext, element).internalName CodegenBinding.asmTypeForAnonymousClass(typeMapper.bindingContext, element).internalName
} }
elementOfClassName is KtClassOrObject -> getClassNameForClass(elementOfClassName, typeMapper) elementOfClassName is KtClassOrObject -> getClassNameForClass(elementOfClassName, typeMapper)
@@ -180,7 +180,7 @@ class DebuggerClassNameProvider(val myDebugProcess: DebugProcess, val scopes: Li
return CachedClassNames(getClassNameForFile(file)) 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) 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 ownerDescriptor = lexicalScope.ownerDescriptor
val className = if (isSuspendDescriptor(ownerDescriptor, typeMapper.bindingContext)) { val className = if (isFunctionWithSuspendStateMachine(ownerDescriptor, typeMapper.bindingContext)) {
originalInternalClassName.replaceAfterLast("$", DO_RESUME_METHOD_NAME) originalInternalClassName.replaceAfterLast("$", DO_RESUME_METHOD_NAME)
} }
else { else {