MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Java: Prevent IOOBE in extract method preview diff (IDEA-189384)

Browse Source
This commit is contained in:
Pavel Dolgov
2018-04-12 12:18:12 +03:00
parent 34bda668a3
commit 7cec5f7c06
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractMethod/preview/PreviewDiffPanel.java
+3 -2
View File
@@ -273,8 +273,9 @@ class PreviewDiffPanel extends BorderLayoutPanel implements Disposable, PreviewT
@NotNull
private static TextRange getLinesRange(@NotNull TextRange textRange, @NotNull Document document) {
return new TextRange(document.getLineStartOffset(document.getLineNumber(textRange.getStartOffset())),
document.getLineEndOffset(document.getLineNumber(textRange.getEndOffset())) + 1);
int startLine = document.getLineNumber(textRange.getStartOffset());
int endLine = document.getLineNumber(Math.min(textRange.getEndOffset(), document.getTextLength()));
return new TextRange(document.getLineStartOffset(startLine), document.getLineEndOffset(endLine));
}
private static void doExtractImpl(@NotNull JavaDuplicatesExtractMethodProcessor processor,
java/java-impl/src/com/intellij/refactoring/extractMethod/preview/PreviewDiffRequest.java
+1 -1
View File
@@ -99,7 +99,7 @@ class PreviewDiffRequest extends SimpleDiffRequest {
int newOffset = e.getEditor().logicalPositionToOffset(e.getNewPosition());
for (Map.Entry<FragmentNode, Couple<TextRange>> entry : myLinesBounds.entrySet()) {
TextRange range = mySideGetter.apply(entry.getValue());
if (range.contains(newOffset)) {
if (range.containsOffset(newOffset)) {
mySelectNode.consume(entry.getKey());
break;
}