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

Merge pull request #8117 from sbt/revert-8109-bsp-compile-status-code 

Revert "fix: BSP error status code in more cases"
This commit is contained in:
eugene yokota 2025-05-10 21:44:55 -07:00 committed by GitHub
parent 25b30ff36e 1d7871233b
commit 684cb483b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala
View File

@ -789,19 +789,11 @@ object BuildServerProtocol {
Keys.compile.result.value match { Keys.compile.result.value match {
case Value(_) => StatusCode.Success case Value(_) => StatusCode.Success
case Inc(cause) => case Inc(cause) =>
var statusCodeOpt: Option[Int] cause.getCause match {
def updateCode(code: Int): Unit = case _: CompileFailed => StatusCode.Error
statusCodeOpt = Some(statusCodeOpt match { case _: InterruptedException => StatusCode.Cancelled
case None => code case err => throw cause
case Some(oldCode) => oldCode.max(code)
})
Incomplete.visitAll(cause.getCause) {
case _: CompileFailed => updateCode(StatusCode.Error)
case _: InterruptedException => updateCode(StatusCode.Cancelled)
} }
statusCodeOpt.getOrElse(throw cause)
} }
} }