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

EA-87991 EA-87365 diff: do not access Document outside of valid ranges

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-09-05 19:45:20 +03:00
parent 97f64b370c
commit 0c4e942a7e
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-api/src/com/intellij/diff/util/LineCol.java
+12 -4
View File
@@ -60,9 +60,16 @@ public class LineCol {
@NotNull
public static LineCol fromOffset(@NotNull Document document, int offset) {
int line = document.getLineNumber(offset);
int column = offset - document.getLineStartOffset(line);
return new LineCol(line, column);
if (offset < document.getTextLength()) {
int line = document.getLineNumber(offset);
int column = offset - document.getLineStartOffset(line);
return new LineCol(line, column);
}
else {
int line = Math.max(0, document.getLineCount() - 1);
int column = document.getLineEndOffset(line) - document.getLineStartOffset(line);
return new LineCol(line, column);
}
}
@NotNull
@@ -79,7 +86,8 @@ public class LineCol {
}
public int toOffset(@NotNull Document document) {
return document.getLineStartOffset(line) + column;
if (line >= document.getLineCount()) return document.getTextLength();
return Math.min(document.getLineStartOffset(line) + column, document.getLineEndOffset(line));
}
public int toOffset(@NotNull Editor editor) {