The Unified and Autonomous Development Platform
fix: build error message swallowed if using \r\n as EOL (#1481)
Robin Shen206ca181757e
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.javaindex 42e484b0ef..7520366bea 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java@@ -34,9 +34,11 @@ public class JobLogEntryEx implements Serializable {// Handle ANSI escape codes according to https://en.wikipedia.org/wiki/ANSI_escape_codepublic static JobLogEntryEx parse(String text, StyleBuilder styleBuilder) {+ text = text.replace("\r\n", "\n");+AtomicInteger cursor = new AtomicInteger(0);List<Message> messages = new ArrayList<>();-+Function<String, Void> textAppender = new Function<String, Void>() {@Overridediff --git a/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.java b/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.javaindex 4d68bdb0c0..679823a2ad 100644--- a/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.java+++ b/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.java@@ -13,6 +13,16 @@ public class JobLogEntryExTest {@Testpublic void test() {JobLogEntryEx entry;++ entry = JobLogEntryEx.parse("a\r\nb", new StyleBuilder());+ assertEquals(Lists.newArrayList(+ new Message(new Style(Style.FOREGROUND_COLOR_DEFAULT, Style.BACKGROUND_COLOR_DEFAULT, false), "a\nb")+ ), entry.getMessages());++ entry = JobLogEntryEx.parse("a\nb", new StyleBuilder());+ assertEquals(Lists.newArrayList(+ new Message(new Style(Style.FOREGROUND_COLOR_DEFAULT, Style.BACKGROUND_COLOR_DEFAULT, false), "a\nb")+ ), entry.getMessages());entry = JobLogEntryEx.parse("\u001b]0;This is the window title\u0007hello\u001b]8;link\u001b\\world\u001b]P1888888just\u001b\u0020\u0020\u0030do", new StyleBuilder());assertEquals(Lists.newArrayList(