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

StepIntersection assertion: allow data/areas to intersect - todo patterns may be defined in a way allowing them to intersect

Browse Source 
http://ea.jetbrains.com/browser/ea_problems/30389
This commit is contained in:
irengrig
2011-10-11 16:32:12 +04:00
parent dc6dadcfc9
commit a22409e32d
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/openapi/vcs/checkin/StepIntersection.java
+5 -7
View File
@@ -99,9 +99,7 @@ public class StepIntersection<Data, Area> {
dataStep();
continue;
}
if (intersects) {
dataStep();
} else if (myDataRange.getStartOffset() < myAreaRange.getStartOffset()) {
if (myDataRange.getEndOffset() < myAreaRange.getEndOffset()) {
dataStep();
} else {
areaStep();
@@ -126,18 +124,18 @@ public class StepIntersection<Data, Area> {
if (myAreaIndex >= myAreas.size()) {
return;
}
assert myAreaRange == null || myAreaRange.getEndOffset() < myAreasConvertor.convert(myAreas.get(myAreaIndex)).getStartOffset() :
/*assert myAreaRange == null || myAreaRange.getEndOffset() < myAreasConvertor.convert(myAreas.get(myAreaIndex)).getStartOffset() :
"Area ranges intersect: first: " + myAreaRange + ", second: " + myAreasConvertor.convert(myAreas.get(myAreaIndex)) + ", text: '" +
myDebugDocumentTextGetter.get() + "'";
myDebugDocumentTextGetter.get() + "'";*/
myCurArea = myAreas.get(myAreaIndex);
myAreaRange = myAreasConvertor.convert(myCurArea);
}
private void dataStep() {
myCurData = myDataIterator.next();
assert myDataRange == null || myDataRange.getEndOffset() < myDataConvertor.convert(myCurData).getStartOffset() :
/*assert myDataRange == null || myDataRange.getEndOffset() < myDataConvertor.convert(myCurData).getStartOffset() :
"Data ranges intersect: first: " + myDataRange + ", second: " + myDataConvertor.convert(myCurData) + ", text: '" +
myDebugDocumentTextGetter.get() + "'";
myDebugDocumentTextGetter.get() + "'";*/
myDataRange = myDataConvertor.convert(myCurData);
}
}