From 11ea5f28e8ba953464ec65d9698f2059baa6732e Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Wed, 7 Oct 2015 14:30:40 +0300 Subject: [PATCH] Debugger: location.sourceName could throw InternalError if codeIndex isn't valid --- .../org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt | 3 +++ .../idea/debugger/breakpoints/KotlinFieldBreakpoint.kt | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt index 01ac37d759f..60cc98924e1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt @@ -156,6 +156,9 @@ public class JetPositionManager(private val myDebugProcess: DebugProcess) : Mult catch (e: AbsentInformationException) { return null } + catch (e: InternalError) { + return null + } val referenceInternalName: String diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt index 278a96c452e..ad43e168f98 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt @@ -265,7 +265,10 @@ class KotlinFieldBreakpoint( location.sourceName() } catch (e: AbsentInformationException) { - getFileName() + fileName + } + catch (e: InternalError) { + fileName } val locationLine = location.lineNumber()