Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

Handle following "real" line breaks correctly

Browse Source
This commit is contained in:
René Pfeuffer
2020-05-29 16:41:33 +02:00
parent ebfc267b93
commit 83145d953b
2 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scm-webapp/src/main/java/sonia/scm/api/v2/resources/LineFilteredOutputStream.java
View File

@@ -32,7 +32,7 @@ class LineFilteredOutputStream extends OutputStream {
private final int start;
private final Integer end;
private boolean inLineBreak;
private Character lastLineBreakCharacter;
private int currentLine = 0;
LineFilteredOutputStream(OutputStream target, Integer start, Integer end) {
@@ -46,25 +46,39 @@ class LineFilteredOutputStream extends OutputStream {
switch (b) {
case '\n':
case '\r':
if (!inLineBreak) {
inLineBreak = true;
if (lastLineBreakCharacter == null) {
keepLineBreakInMind((char) b);
} else if (lastLineBreakCharacter == b) {
if (currentLine > start && currentLine <= end) {
target.write('\n');
}
++currentLine;
} else {
if (currentLine > start && currentLine <= end) {
target.write('\n');
}
lastLineBreakCharacter = null;
}
break;
default:
if (inLineBreak && currentLine > start && currentLine <= end) {
if (lastLineBreakCharacter != null && currentLine > start && currentLine <= end) {
target.write('\n');
}
inLineBreak = false;
lastLineBreakCharacter = null;
if (currentLine >= start && currentLine < end) {
target.write(b);
}
}
}
public void keepLineBreakInMind(char b) {
lastLineBreakCharacter = b;
++currentLine;
}
@Override
public void close() throws IOException {
if (inLineBreak && currentLine >= start && currentLine < end) {
if (lastLineBreakCharacter != null && currentLine >= start && currentLine < end) {
target.write('\n');
}
target.close();