From 0701df35a44998d4b2d1863ccea5a07339b89b15 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Fri, 9 Jun 2017 15:29:10 +0200 Subject: [PATCH 1/3] Tree: Fix the pipe symbol to match the other UTF-8 symbols used The "branching" symbols used to print the tree are UTF-8 characters. Make the pipe symbol be the matching UTF-8 character to close the tiny gap between symbols visible in the tree before. --- core/shared/src/main/scala/coursier/util/Tree.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/shared/src/main/scala/coursier/util/Tree.scala b/core/shared/src/main/scala/coursier/util/Tree.scala index 2e1cfe553..5a12edb34 100644 --- a/core/shared/src/main/scala/coursier/util/Tree.scala +++ b/core/shared/src/main/scala/coursier/util/Tree.scala @@ -36,7 +36,7 @@ object Tree { def showLine(isLast: Seq[Boolean]): String = { val initPrefix = init(isLast) { case true => " " - case false => "| " + case false => "│ " }.mkString val lastPrefix = last(isLast) { From b3d07e13539d81d0a0f6b8fc08fb24075e5bb315 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Fri, 9 Jun 2017 18:38:01 +0200 Subject: [PATCH 2/3] TreeTests: Adjust the test to the new UTF-8 pipe character --- .../src/test/scala/coursier/util/TreeTests.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/shared/src/test/scala/coursier/util/TreeTests.scala b/tests/shared/src/test/scala/coursier/util/TreeTests.scala index 0f9dcb758..a50254e2b 100644 --- a/tests/shared/src/test/scala/coursier/util/TreeTests.scala +++ b/tests/shared/src/test/scala/coursier/util/TreeTests.scala @@ -18,11 +18,11 @@ object TreeTests extends TestSuite { 'apply { val str = Tree[Node](roots)(_.children, _.label) assert(str == """├─ p1 - || ├─ c1 - || └─ c2 - |└─ p2 - | ├─ c3 - | └─ c4""".stripMargin) + ││ ├─ c1 + ││ └─ c2 + │└─ p2 + │ ├─ c3 + │ └─ c4""".stripMargin) } } } From e7fad2316fe4325cfa80db9d2dfc816f3c525e90 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 12 Jun 2017 02:00:41 +0200 Subject: [PATCH 3/3] Tweak margin character in test --- .../src/test/scala/coursier/util/TreeTests.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/shared/src/test/scala/coursier/util/TreeTests.scala b/tests/shared/src/test/scala/coursier/util/TreeTests.scala index a50254e2b..c41113850 100644 --- a/tests/shared/src/test/scala/coursier/util/TreeTests.scala +++ b/tests/shared/src/test/scala/coursier/util/TreeTests.scala @@ -18,11 +18,11 @@ object TreeTests extends TestSuite { 'apply { val str = Tree[Node](roots)(_.children, _.label) assert(str == """├─ p1 - ││ ├─ c1 - ││ └─ c2 - │└─ p2 - │ ├─ c3 - │ └─ c4""".stripMargin) + #│ ├─ c1 + #│ └─ c2 + #└─ p2 + # ├─ c3 + # └─ c4""".stripMargin('#')) } } }