From 405dba87151425d0f85b98e2a521b8bdfcd063a0 Mon Sep 17 00:00:00 2001 From: Jorge Vicente Cantero Date: Mon, 20 Apr 2020 17:00:20 +0200 Subject: [PATCH 1/3] Use `StringBuilder` in `AnsiColors` Fixes https://github.com/scalameta/munit/issues/108 --- .../src/main/scala/munit/internal/console/AnsiColors.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/munit/shared/src/main/scala/munit/internal/console/AnsiColors.scala b/munit/shared/src/main/scala/munit/internal/console/AnsiColors.scala index 210134c2..8b173693 100644 --- a/munit/shared/src/main/scala/munit/internal/console/AnsiColors.scala +++ b/munit/shared/src/main/scala/munit/internal/console/AnsiColors.scala @@ -23,7 +23,7 @@ object AnsiColors { if (s == null) { null } else { - var r: String = "" + var r: StringBuilder = new StringBuilder() val len = s.length var i = 0 while (i < len) { @@ -36,7 +36,7 @@ object AnsiColors { } i += 1 } - r + r.mkString } } From 6b6fd95b58f82786ff40e0d65c00eb05ff406f92 Mon Sep 17 00:00:00 2001 From: Jorge Date: Mon, 20 Apr 2020 17:48:08 +0200 Subject: [PATCH 2/3] Update AnsiColors.scala --- .../src/main/scala/munit/internal/console/AnsiColors.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/munit/shared/src/main/scala/munit/internal/console/AnsiColors.scala b/munit/shared/src/main/scala/munit/internal/console/AnsiColors.scala index 8b173693..0f0ebd74 100644 --- a/munit/shared/src/main/scala/munit/internal/console/AnsiColors.scala +++ b/munit/shared/src/main/scala/munit/internal/console/AnsiColors.scala @@ -23,7 +23,7 @@ object AnsiColors { if (s == null) { null } else { - var r: StringBuilder = new StringBuilder() + val r = new StringBuilder() val len = s.length var i = 0 while (i < len) { From e367f1a866b3680ae303eb2a5bb962229cc18cd7 Mon Sep 17 00:00:00 2001 From: Olafur Pall Geirsson Date: Mon, 20 Apr 2020 16:13:26 +0000 Subject: [PATCH 3/3] Use line-by-line translation of Ansi.java --- .../src/main/scala/munit/internal/console/AnsiColors.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/munit/shared/src/main/scala/munit/internal/console/AnsiColors.scala b/munit/shared/src/main/scala/munit/internal/console/AnsiColors.scala index 0f0ebd74..dad6004d 100644 --- a/munit/shared/src/main/scala/munit/internal/console/AnsiColors.scala +++ b/munit/shared/src/main/scala/munit/internal/console/AnsiColors.scala @@ -23,8 +23,8 @@ object AnsiColors { if (s == null) { null } else { - val r = new StringBuilder() val len = s.length + val r = new java.lang.StringBuilder(len) var i = 0 while (i < len) { val c = s.charAt(i) @@ -32,11 +32,11 @@ object AnsiColors { i += 1 while (i < len && s.charAt(i) != 'm') i += 1 } else { - r += c + r.append(c) } i += 1 } - r.mkString + r.toString() } }