From 201ef286db9fc59d74e5b35d0226f35815a49d61 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Tue, 31 May 2016 13:43:23 +0200
Subject: [PATCH] Stacktrace-less exceptions in SBT plugin

---
 .../coursier/ResolutionException.scala        | 11 +++++
 .../src/main/scala-2.10/coursier/Tasks.scala  | 49 +++++++++----------
 2 files changed, 33 insertions(+), 27 deletions(-)
 create mode 100644 plugin/src/main/scala-2.10/coursier/ResolutionException.scala

diff --git a/plugin/src/main/scala-2.10/coursier/ResolutionException.scala b/plugin/src/main/scala-2.10/coursier/ResolutionException.scala
new file mode 100644
index 000000000..f59605eda
--- /dev/null
+++ b/plugin/src/main/scala-2.10/coursier/ResolutionException.scala
@@ -0,0 +1,11 @@
+package coursier
+
+final class ResolutionException(
+  val message: String,
+  val cause: Throwable = null
+) extends Exception(
+  message,
+  cause,
+  true,
+  false // don't keep stack trace around (improves readability from the SBT console)
+)
diff --git a/plugin/src/main/scala-2.10/coursier/Tasks.scala b/plugin/src/main/scala-2.10/coursier/Tasks.scala
index bfd3c2ca0..21c786708 100644
--- a/plugin/src/main/scala-2.10/coursier/Tasks.scala
+++ b/plugin/src/main/scala-2.10/coursier/Tasks.scala
@@ -506,27 +506,27 @@ object Tasks {
           .process
           .run(fetch, maxIterations)
           .attemptRun
-          .leftMap(ex => throw new Exception("Exception during resolution", ex))
+          .leftMap(ex => throw new ResolutionException("Exception during resolution", ex))
           .merge
 
         resLogger.stop()
 
 
         if (!res.isDone)
-          throw new Exception("Maximum number of iteration of dependency resolution reached")
+          throw new ResolutionException("Maximum number of iteration of dependency resolution reached")
 
         if (res.conflicts.nonEmpty) {
           val projCache = res.projectCache.mapValues { case (_, p) => p }
-          log.error(
-            s"${res.conflicts.size} conflict(s):\n" +
-              "  " + Print.dependenciesUnknownConfigs(res.conflicts.toVector, projCache)
+
+          throw new ResolutionException(
+            "Conflict(s) in dependency resolution:\n  " +
+              Print.dependenciesUnknownConfigs(res.conflicts.toVector, projCache)
           )
-          throw new Exception("Conflict(s) in dependency resolution")
         }
 
-        if (res.errors.nonEmpty) {
-          log.error(
-            s"\n${res.errors.size} error(s):\n" +
+        if (res.errors.nonEmpty)
+          throw new ResolutionException(
+            s"Encountered ${res.errors.length} error(s) in dependency resolution:\n" +
               res.errors.map {
                 case (dep, errs) =>
                   s"  ${dep.module}:${dep.version}:\n" +
@@ -536,9 +536,6 @@ object Tasks {
               }.mkString("\n")
           )
 
-          throw new Exception(s"Encountered ${res.errors.length} error(s) in dependency resolution")
-        }
-
         if (verbosityLevel >= 0)
           log.info(s"Resolved ${projectDescription(currentProject)} dependencies")
 
@@ -706,7 +703,7 @@ object Tasks {
 
         val artifactFilesOrErrors = Task.gatherUnordered(artifactFileOrErrorTasks).attemptRun match {
           case -\/(ex) =>
-            throw new Exception("Error while downloading / verifying artifacts", ex)
+            throw new ResolutionException("Error while downloading / verifying artifacts", ex)
           case \/-(l) =>
             l.toMap
         }
@@ -736,25 +733,23 @@ object Tasks {
             .toVector
             .sortBy(_._1)
 
+          val b = new StringBuilder
+
           for ((type0, errors) <- groupedArtifactErrors) {
             def msg = s"${errors.size} $type0"
-            if (ignoreArtifactErrors)
-              log.warn(msg)
-            else
-              log.error(msg)
+            b ++= msg
 
-            if (!ignoreArtifactErrors || verbosityLevel >= 1) {
-              if (ignoreArtifactErrors)
-                for (err <- errors)
-                  log.warn("  " + err)
-              else
-                for (err <- errors)
-                  log.error("  " + err)
-            }
+            if (!ignoreArtifactErrors || verbosityLevel >= 1)
+              for (err <- errors)
+                b ++= "  " + err
           }
 
-          if (!ignoreArtifactErrors)
-            throw new Exception(s"Encountered ${artifactErrors.length} errors (see above messages)")
+          if (ignoreArtifactErrors)
+            log.warn(b.result())
+          else
+            throw new ResolutionException(
+              s"Encountered ${artifactErrors.length} errors:\n" + b.result()
+            )
         }
 
         // can be non empty only if ignoreArtifactErrors is true