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

[patch]: remember last step after context instead of ignore it

Browse Source
This commit is contained in:
Nadya Zabrodina
2016-04-25 15:36:03 +03:00
committed by Nadya Zabrodina
parent bc4109795e
commit 515b8c878d
1 changed files with 3 additions and 1 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
+3 -1
View File
@@ -180,7 +180,8 @@ public class GenericPatchApplier {
final List<BeforeAfter<List<String>>> steps = copy.getPatchSteps();
final BeforeAfter<List<String>> first = steps.get(0);
final BeforeAfter<List<String>> last = steps.get(steps.size() - 1);
final int lastStepIndex = steps.size() - 1;
final BeforeAfter<List<String>> last = steps.get(lastStepIndex);
final BeforeAfter<List<String>> firstCopy = copyBeforeAfter(first);
steps.set(0, firstCopy);
@@ -194,6 +195,7 @@ public class GenericPatchApplier {
final BeforeAfter<List<String>> lastCopy = copyBeforeAfter(last);
lastCopy.getBefore().addAll(hunk.getContextAfter());
lastCopy.getAfter().addAll(hunk.getContextAfter());
steps.set(lastStepIndex, lastCopy);
}
return copy;
}