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

assertion for assigning negative offsets

Browse Source
This commit is contained in:
Alexey Kudravtsev
2015-05-19 12:31:07 +03:00
parent 7094cb6f7b
commit d3be5f0438
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/openapi/editor/impl/RangeMarkerImpl.java
+14 -7
View File
@@ -80,13 +80,13 @@ public class RangeMarkerImpl extends UserDataHolderBase implements RangeMarkerEx
@Override
public int getStartOffset() {
RangeMarkerTree.RMNode node = myNode;
return intervalStart() + (node == null ? 0 : node.computeDeltaUpToRoot());
return node == null ? -1 : node.intervalStart() + node.computeDeltaUpToRoot();
}
@Override
public int getEndOffset() {
RangeMarkerTree.RMNode node = myNode;
return intervalEnd() + (node == null ? 0 : node.computeDeltaUpToRoot());
return node == null ? -1 : node.intervalEnd() + node.computeDeltaUpToRoot();
}
void invalidate(@NotNull final Object reason) {
@@ -141,7 +141,7 @@ public class RangeMarkerImpl extends UserDataHolderBase implements RangeMarkerEx
}
@Override
public final void documentChanged(DocumentEvent e) {
public final void documentChanged(@NotNull DocumentEvent e) {
int oldStart = intervalStart();
int oldEnd = intervalEnd();
int docLength = myDocument.getTextLength();
@@ -166,7 +166,7 @@ public class RangeMarkerImpl extends UserDataHolderBase implements RangeMarkerEx
}
}
protected void changedUpdateImpl(DocumentEvent e) {
protected void changedUpdateImpl(@NotNull DocumentEvent e) {
if (!isValid()) return;
// Process if one point.
@@ -214,7 +214,7 @@ public class RangeMarkerImpl extends UserDataHolderBase implements RangeMarkerEx
invalidate(e);
}
private void processIfOnePoint(DocumentEvent e) {
private void processIfOnePoint(@NotNull DocumentEvent e) {
int offset = e.getOffset();
int oldLength = e.getOldLength();
int oldEnd = offset + oldLength;
@@ -236,17 +236,24 @@ public class RangeMarkerImpl extends UserDataHolderBase implements RangeMarkerEx
@NonNls
public String toString() {
return "RangeMarker" + (isGreedyToLeft() ? "[" : "(") + (isValid() ? "valid" : "invalid") + "," + getStartOffset() + "," + getEndOffset() + (
isGreedyToRight() ? "]" : ")") + " " + getId();
return "RangeMarker" + (isGreedyToLeft() ? "[" : "(")
+ (isValid() ? "" : "invalid:") + getStartOffset() + "," + getEndOffset()
+ (isGreedyToRight() ? "]" : ")") + " " + getId();
}
@Override
public int setIntervalStart(int start) {
if (start < 0) {
LOG.error("Negative start: " + start);
}
return myNode.setIntervalStart(start);
}
@Override
public int setIntervalEnd(int end) {
if (end < 0) {
LOG.error("Negative end: "+end);
}
return myNode.setIntervalEnd(end);
}