From 8d19f0a421ebd5de8cfe117040ef61a3cf8ce6ed Mon Sep 17 00:00:00 2001
From: Kai <450507+neko-kai@users.noreply.github.com>
Date: Sat, 25 Feb 2023 19:47:22 +0000
Subject: [PATCH] Add a newline delimiter to PlanCheck error message with
 multiple errors

---
 .../model/exceptions/runtime/MissingInstanceException.scala     | 2 +-
 .../main/scala/izumi/distage/planning/solver/PlanVerifier.scala | 1 -
 .../.jvm/src/main/scala/izumi/distage/framework/PlanCheck.scala | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/distage/distage-core-api/src/main/scala/izumi/distage/model/exceptions/runtime/MissingInstanceException.scala b/distage/distage-core-api/src/main/scala/izumi/distage/model/exceptions/runtime/MissingInstanceException.scala
index c2123a8a3a..39ff8748b0 100644
--- a/distage/distage-core-api/src/main/scala/izumi/distage/model/exceptions/runtime/MissingInstanceException.scala
+++ b/distage/distage-core-api/src/main/scala/izumi/distage/model/exceptions/runtime/MissingInstanceException.scala
@@ -14,7 +14,7 @@ object MissingInstanceException {
 
     val refRepr = target.tpe.tag.ref.render()
 
-    def formatRelevant(similar: Iterable[Binding], header: String) = {
+    def formatRelevant(similar: Iterable[Binding], header: String): Seq[String] = {
       Option(similar)
         .filterNot(_.isEmpty)
         .map {
diff --git a/distage/distage-core/src/main/scala/izumi/distage/planning/solver/PlanVerifier.scala b/distage/distage-core/src/main/scala/izumi/distage/planning/solver/PlanVerifier.scala
index 247102cd64..6a82682906 100644
--- a/distage/distage-core/src/main/scala/izumi/distage/planning/solver/PlanVerifier.scala
+++ b/distage/distage-core/src/main/scala/izumi/distage/planning/solver/PlanVerifier.scala
@@ -496,7 +496,6 @@ object PlanVerifier {
 
     implicit class PlanIssueOps(private val issue: PlanIssue) extends AnyVal {
       def render: String = {
-
         issue match {
           case i: UnsaturatedAxis =>
             s"${i.key}: axis ${i.axis} has no bindings for choices ${i.missingAxisValues.mkString(", ")}"
diff --git a/distage/distage-framework/.jvm/src/main/scala/izumi/distage/framework/PlanCheck.scala b/distage/distage-framework/.jvm/src/main/scala/izumi/distage/framework/PlanCheck.scala
index 4cf2223639..8c0033eadc 100644
--- a/distage/distage-framework/.jvm/src/main/scala/izumi/distage/framework/PlanCheck.scala
+++ b/distage/distage-framework/.jvm/src/main/scala/izumi/distage/framework/PlanCheck.scala
@@ -141,7 +141,7 @@ object PlanCheck {
 
       def returnPlanCheckError(cause: Either[Throwable, PlanVerifierResult.Incorrect]): PlanCheckResult.Incorrect = {
         val visitedKeys = cause.fold(_ => Set.empty[DIKey], _.visitedKeys)
-        val errorMsg = cause.fold("\n" + _.stackTrace, _.issues.fromNonEmptySet.map(_.render).niceList())
+        val errorMsg = cause.fold("\n" + _.stackTrace, _.issues.fromNonEmptySet.map(_.render + "\n").niceList())
         val message = {
           val configStr = if (checkConfig) {
             s"\n  config              = ${chosenConfig.fold("*")(c => s"resource:$c")} (effective: $effectiveConfig)"