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

Fix exception during Step Over

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-10-19 18:29:39 +03:00
parent 3a9beb719f
commit 556e08b9eb
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
+8 -1
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.idea.debugger.stepping package org.jetbrains.kotlin.idea.debugger.stepping
import com.intellij.debugger.NoDataException
import com.intellij.debugger.SourcePosition import com.intellij.debugger.SourcePosition
import com.intellij.debugger.engine.DebugProcessImpl import com.intellij.debugger.engine.DebugProcessImpl
import com.intellij.debugger.engine.SuspendContextImpl import com.intellij.debugger.engine.SuspendContextImpl
@@ -354,7 +355,13 @@ private fun SuspendContextImpl.getNextPositionWithFilter(
skip: (JetFile, Int) -> Boolean skip: (JetFile, Int) -> Boolean
): XSourcePositionImpl? { ): XSourcePositionImpl? {
for (location in locations) { for (location in locations) {
val file = this.debugProcess.positionManager.getSourcePosition(location)?.file as? JetFile ?: continue val file = try {
this.debugProcess.positionManager.getSourcePosition(location)?.file as? JetFile
}
catch(e: NoDataException) {
null
} ?: continue
val currentLine = location.lineNumber() - 1 val currentLine = location.lineNumber() - 1
val lineStartOffset = file.getLineStartOffset(currentLine) ?: continue val lineStartOffset = file.getLineStartOffset(currentLine) ?: continue
if (skip(file, lineStartOffset)) continue if (skip(file, lineStartOffset)) continue