From 5cea6cfb4537a802f6b8aa91f011f98359cd351c Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Tue, 17 Mar 2015 12:18:39 +0300
Subject: [PATCH] Extra variables: check range before create

---
 .../debugger/KotlinFrameExtraVariablesProvider.kt | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

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<TextWithImp
     val vFile = file.getVirtualFile()
     val doc = if (vFile != null) FileDocumentManager.getInstance().getDocument(vFile) else null
     if (doc == null || doc.getLineCount() == 0 || line > (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<TextWithImp
         endLine++
     }
 
-    val lineRange = TextRange(doc.getLineStartOffset(startLine), doc.getLineEndOffset(endLine))
-    if (lineRange.isEmpty()) return setOf()
+    val startOffset = doc.getLineStartOffset(startLine)
+    val endOffset = doc.getLineEndOffset(endLine)
+
+    if (startOffset >= endOffset) return emptySet()
+
+    val lineRange = TextRange(startOffset, endOffset)
+    if (lineRange.isEmpty()) return emptySet()
 
     val expressions = LinkedHashSet<TextWithImports>()