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

apply patch symmetric deletions and insertions cases

Browse Source
This commit is contained in:
irengrig
2011-10-06 17:59:25 +04:00
parent 68033b54a8
commit 2a0b0b64aa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/GenericPatchApplier.java
+2 -2
View File
@@ -393,7 +393,7 @@ public class GenericPatchApplier {
myHadAlreadyAppliedMet = value.isHaveAlreadyApplied();
} else {
// deletion
myTransformations.put(new TextRange(j, i), new MyAppliedData(Collections.<String>emptyList(), value.isHaveAlreadyApplied(),
myTransformations.put(new TextRange(j, i + (cntStart - endSize)), new MyAppliedData(Collections.<String>emptyList(), value.isHaveAlreadyApplied(),
value.isPlaceCoinside(), value.isChangedCoinside(), value.myChangeType));
}
} else {
@@ -402,7 +402,7 @@ public class GenericPatchApplier {
// just took one line
assert cntStart > 0;
final MyAppliedData newData =
new MyAppliedData(new ArrayList<String>(list.subList(cntStart - 1, endSize)), value.isHaveAlreadyApplied(), value.isPlaceCoinside(),
new MyAppliedData(new ArrayList<String>(list.subList(cntStart - (j - i), endSize)), value.isHaveAlreadyApplied(), value.isPlaceCoinside(),
value.isChangedCoinside(), value.myChangeType);
final TextRange newRange = new TextRange(i, i);
myTransformations.put(newRange, newData);