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

Do not compute class names for inline usages during stepping (KT-18411)

Browse Source 
This was lost in "Debugger: Fix AbstractPositionManagerTest"(622430a29)

ExtraSteppingFilter: do not compute classNames for inline (f28f7eaa3b)

 #KT-18411 Fixed
This commit is contained in:
Nikolay Krasko
2017-06-26 16:54:45 +03:00
parent 7d7ef18e99
commit d8d862fa68
2 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/KotlinExtraSteppingFilter.kt
+1 -1
View File
@@ -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
}
idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
+2 -2
View File
@@ -243,8 +243,8 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
throw NoDataException.INSTANCE
}
fun originalClassNameForPosition(position: SourcePosition): List<String> {
return DebuggerClassNameProvider(myDebugProcess, scopes).getOuterClassNamesForPosition(position)
fun originalClassNamesForPosition(position: SourcePosition): List<String> {
return DebuggerClassNameProvider(myDebugProcess, scopes, findInlineUseSites = false).getOuterClassNamesForPosition(position)
}
override fun locationsOfLine(type: ReferenceType, position: SourcePosition): List<Location> {