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

Fix EA-135863: Access allLineLocations() safely

Browse Source
This commit is contained in:
Yan Zhulanow
2019-02-21 00:52:19 +03:00
parent b54f9a0c05
commit bab1c63126
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
+5 -1
View File
@@ -339,7 +339,11 @@ fun getStepOverAction(
val project = sourceFile.project val project = sourceFile.project
val methodLocations = location.method().allLineLocations() val methodLocations = location.method().safeAllLineLocations()
if (methodLocations.isEmpty()) {
return Action.STEP_OVER()
}
val locationsLineAndFile = methodLocations.keysToMap { ktLocationInfo(it, isDexDebug, project, true) } val locationsLineAndFile = methodLocations.keysToMap { ktLocationInfo(it, isDexDebug, project, true) }
fun Location.ktLineNumber(): Int = (locationsLineAndFile[this] ?: ktLocationInfo(this, isDexDebug, project, true)).first fun Location.ktLineNumber(): Int = (locationsLineAndFile[this] ?: ktLocationInfo(this, isDexDebug, project, true)).first