diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt index 7247aae83cc..a57469c6ca5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt @@ -62,16 +62,16 @@ private fun findAdditionalExpressions(position: SourcePosition): Set (doc.getLineCount() - 1)) { - return setOf() + return emptySet() } val offset = doc.getLineStartOffset(line) - if (offset < 0) return setOf() + if (offset < 0) return emptySet() val elem = file.findElementAt(offset) val containingElement = getContainingElement(elem) ?: elem - if (containingElement == null) return setOf() + if (containingElement == null) return emptySet() val limit = getLineRangeForElement(containingElement, doc) @@ -85,8 +85,13 @@ private fun findAdditionalExpressions(position: SourcePosition): Set= endOffset) return emptySet() + + val lineRange = TextRange(startOffset, endOffset) + if (lineRange.isEmpty()) return emptySet() val expressions = LinkedHashSet()