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

Extra variables: check range before create

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-03-17 12:18:39 +03:00
parent 429a50ab87
commit 5cea6cfb45
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt
+10 -5
View File
@@ -62,16 +62,16 @@ private fun findAdditionalExpressions(position: SourcePosition): Set<TextWithImp
val vFile = file.getVirtualFile() val vFile = file.getVirtualFile()
val doc = if (vFile != null) FileDocumentManager.getInstance().getDocument(vFile) else null val doc = if (vFile != null) FileDocumentManager.getInstance().getDocument(vFile) else null
if (doc == null || doc.getLineCount() == 0 || line > (doc.getLineCount() - 1)) { if (doc == null || doc.getLineCount() == 0 || line > (doc.getLineCount() - 1)) {
return setOf() return emptySet()
} }
val offset = doc.getLineStartOffset(line) val offset = doc.getLineStartOffset(line)
if (offset < 0) return setOf() if (offset < 0) return emptySet()
val elem = file.findElementAt(offset) val elem = file.findElementAt(offset)
val containingElement = getContainingElement(elem) ?: elem val containingElement = getContainingElement(elem) ?: elem
if (containingElement == null) return setOf() if (containingElement == null) return emptySet()
val limit = getLineRangeForElement(containingElement, doc) val limit = getLineRangeForElement(containingElement, doc)
@@ -85,8 +85,13 @@ private fun findAdditionalExpressions(position: SourcePosition): Set<TextWithImp
endLine++ endLine++
} }
val lineRange = TextRange(doc.getLineStartOffset(startLine), doc.getLineEndOffset(endLine)) val startOffset = doc.getLineStartOffset(startLine)
if (lineRange.isEmpty()) return setOf() val endOffset = doc.getLineEndOffset(endLine)
if (startOffset >= endOffset) return emptySet()
val lineRange = TextRange(startOffset, endOffset)
if (lineRange.isEmpty()) return emptySet()
val expressions = LinkedHashSet<TextWithImports>() val expressions = LinkedHashSet<TextWithImports>()