luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fill error message when BSP task fails

This commit is contained in:
Adrien Piquerez 2021-06-24 16:26:16 +02:00
parent 9274a3e365
commit 74ff1b0a4a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/main/scala/sbt/EvaluateTask.scala
View File

@ -9,7 +9,6 @@ package sbt
import java.io.File import java.io.File
import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.atomic.AtomicReference
import sbt.Def.{ ScopedKey, Setting, dummyState } import sbt.Def.{ ScopedKey, Setting, dummyState }
import sbt.Keys.{ TaskProgress => _, name => _, _ } import sbt.Keys.{ TaskProgress => _, name => _, _ }
import sbt.Project.richInitializeTask import sbt.Project.richInitializeTask
@ -18,10 +17,12 @@ import sbt.SlashSyntax0._
import sbt.internal.Aggregation.KeyValue import sbt.internal.Aggregation.KeyValue
import sbt.internal.TaskName._ import sbt.internal.TaskName._
import sbt.internal._ import sbt.internal._
import sbt.internal.langserver.ErrorCodes
import sbt.internal.util.{ Terminal => ITerminal, _ } import sbt.internal.util.{ Terminal => ITerminal, _ }
import sbt.librarymanagement.{ Resolver, UpdateReport } import sbt.librarymanagement.{ Resolver, UpdateReport }
import sbt.std.Transform.DummyTaskMap import sbt.std.Transform.DummyTaskMap
import sbt.util.{ Logger, Show } import sbt.util.{ Logger, Show }
import sbt.BuildSyntax._
import scala.annotation.nowarn import scala.annotation.nowarn
import scala.Console.RED import scala.Console.RED
@ -367,11 +368,13 @@ object EvaluateTask {
} }
} }
for ((key, msg, ex) <- keyed if (msg.isDefined || ex.isDefined)) { for ((key, msg, ex) <- keyed if msg.isDefined || ex.isDefined) {
val msgString = (msg.toList ++ ex.toList.map(ErrorHandling.reducedToString)).mkString("\n\t") val msgString = (msg.toList ++ ex.toList.map(ErrorHandling.reducedToString)).mkString("\n\t")
val log = getStreams(key, streams).log val log = getStreams(key, streams).log
val display = contextDisplay(state, ITerminal.isColorEnabled) val display = contextDisplay(state, ITerminal.isColorEnabled)
log.error("(" + display.show(key) + ") " + msgString) val errorMessage = "(" + display.show(key) + ") " + msgString
state.respondError(ErrorCodes.InternalError, errorMessage)
log.error(errorMessage)
} }
} }