From d8d862fa68c6a1edc4be4f31041523e9b836c7a3 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 26 Jun 2017 16:54:45 +0300 Subject: [PATCH] Do not compute class names for inline usages during stepping (KT-18411) This was lost in "Debugger: Fix AbstractPositionManagerTest"(622430a29) ExtraSteppingFilter: do not compute classNames for inline (f28f7eaa3ba) #KT-18411 Fixed --- .../org/jetbrains/kotlin/idea/KotlinExtraSteppingFilter.kt | 2 +- .../jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinExtraSteppingFilter.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinExtraSteppingFilter.kt index f1a90c60a27..e0505a4725c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinExtraSteppingFilter.kt +++ b/idea/src/org/jetbrains/kotlin/idea/KotlinExtraSteppingFilter.kt @@ -62,7 +62,7 @@ class KotlinExtraSteppingFilter : ExtraSteppingFilter { val settings = DebuggerSettings.getInstance() if (settings.TRACING_FILTERS_ENABLED) { - val classNames = positionManager.originalClassNameForPosition(sourcePosition).map { it.replace('/', '.') } + val classNames = positionManager.originalClassNamesForPosition(sourcePosition).map { it.replace('/', '.') } if (classNames.isEmpty()) { return false } diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt index d7bddb2f229..5dbee420805 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt @@ -243,8 +243,8 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq throw NoDataException.INSTANCE } - fun originalClassNameForPosition(position: SourcePosition): List { - return DebuggerClassNameProvider(myDebugProcess, scopes).getOuterClassNamesForPosition(position) + fun originalClassNamesForPosition(position: SourcePosition): List { + return DebuggerClassNameProvider(myDebugProcess, scopes, findInlineUseSites = false).getOuterClassNamesForPosition(position) } override fun locationsOfLine(type: ReferenceType, position: SourcePosition): List {