From 8d3e4a29658a9e94dd2c20ee41ee1b8072091cff Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Thu, 9 Jan 2020 15:55:21 +0100 Subject: [PATCH] IAE: RangeMarkerImpl. #EA-141884 Fixed --- .../jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt | 3 ++- .../kotlin/idea/refactoring/kotlinRefactoringUtil.kt.193 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt index c47a3703a87..342a9ff799f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt @@ -298,8 +298,9 @@ class SelectionAwareScopeHighlighter(val editor: Editor) { val attributes = EditorColorsManager.getInstance().globalScheme.getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES)!! val selectedRange = with(editor.selectionModel) { TextRange(selectionStart, selectionEnd) } + val textLength = editor.document.textLength for (r in RangeSplitter.split(affectedRange, Collections.singletonList(selectedRange))) { - addHighlighter(r, attributes) + if (r.endOffset <= textLength) addHighlighter(r, attributes) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.193 b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.193 index 5573a7b799c..302548ac3d0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.193 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt.193 @@ -297,8 +297,9 @@ class SelectionAwareScopeHighlighter(val editor: Editor) { val attributes = EditorColorsManager.getInstance().globalScheme.getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES)!! val selectedRange = with(editor.selectionModel) { TextRange(selectionStart, selectionEnd) } + val textLength = editor.document.textLength for (r in RangeSplitter.split(affectedRange, Collections.singletonList(selectedRange))) { - addHighlighter(r, attributes) + if (r.endOffset <= textLength) addHighlighter(r, attributes) } }