From 61b10ac330abdd8919e89e17a2867b76d7031730 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 2 Aug 2017 19:42:50 +0300 Subject: [PATCH] Make class prepare request pattern more precise (KT-19429) Do not bother with check for irrelevant classes. #KT-19429 Fixed --- .../kotlin/idea/debugger/KotlinPositionManager.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt index 23d97ed528e..d5a5f1ab09d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt @@ -284,8 +284,11 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq } val classNames = DebuggerClassNameProvider(myDebugProcess, scopes).getOuterClassNamesForPosition(position) - return classNames.mapNotNull { name -> - myDebugProcess.requestsManager.createClassPrepareRequest(requestor, name + "*") + return classNames.flatMap { name -> + listOfNotNull( + myDebugProcess.requestsManager.createClassPrepareRequest(requestor, name), + myDebugProcess.requestsManager.createClassPrepareRequest(requestor, "$name$*") + ) } }