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]: IDEA-158750 "Apply Patch" adds spurious newline at the end of file, tests added

Browse Source 
* existence of new line should be inherited by result from base content (before) if no hunks override it;
* if some hunk overrides last line - it should be inherited from this hunk (after content);
This commit is contained in:
Nadya Zabrodina
2016-07-20 01:36:50 +03:00
parent 1d3733a2ce
commit a088e310dc
1 changed files with 15 additions and 4 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
+15 -4
View File
@@ -43,6 +43,7 @@ public class GenericPatchApplier {
private final TreeMap<TextRange, MyAppliedData> myTransformations;
private final List<String> myLines;
private final List<PatchHunk> myHunks;
private final boolean myBaseFileEndsWithNewLine;
private boolean myHadAlreadyAppliedMet;
private final ArrayList<SplitHunk> myNotBound;
@@ -61,6 +62,7 @@ public class GenericPatchApplier {
debug("GenericPatchApplier created, hunks: " + hunks.size());
myLines = new ArrayList<String>();
Collections.addAll(myLines, LineTokenizer.tokenize(text, false));
myBaseFileEndsWithNewLine = StringUtil.endsWithLineBreak(text);
myHunks = hunks;
final Comparator<TextRange> textRangeComparator =
(o1, o2) -> new Integer(o1.getStartOffset()).compareTo(new Integer(o2.getStartOffset()));
@@ -1041,16 +1043,25 @@ public class GenericPatchApplier {
for (SplitHunk hunk : myNotBound) {
linesToSb(sb, hunk.getAfterAll());
}
iterateTransformations(range -> linesToSb(sb, myLines.subList(range.getStartOffset(), range.getEndOffset() + 1)), range -> {
iterateTransformations(range -> {
linesToSb(sb, myLines.subList(range.getStartOffset(), range.getEndOffset() + 1));
if (containsLastLine(range) && myBaseFileEndsWithNewLine) {
sb.append('\n');
}
}, range -> {
final MyAppliedData appliedData = myTransformations.get(range);
linesToSb(sb, appliedData.getList());
if (containsLastLine(range) && !mySuppressNewLineInEnd) {
sb.append('\n');
}
});
if (! mySuppressNewLineInEnd) {
sb.append('\n');
}
return sb.toString();
}
private boolean containsLastLine(@NotNull TextRange range) {
return range.getEndOffset() == myLines.size() - 1;
}
private static void linesToSb(final StringBuilder sb, final List<String> list) {
if (sb.length() > 0 && !list.isEmpty()) {
sb.append("\n");