From 1d7871233bc54e8766d4014ccd769b62cb6c4c2a Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Sun, 11 May 2025 12:59:15 +0900 Subject: [PATCH] Revert "fix: BSP error status code in more cases" --- .../internal/server/BuildServerProtocol.scala | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala index d2c812167..9bb371a78 100644 --- a/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala +++ b/main/src/main/scala/sbt/internal/server/BuildServerProtocol.scala @@ -789,19 +789,11 @@ object BuildServerProtocol { Keys.compile.result.value match { case Value(_) => StatusCode.Success case Inc(cause) => - var statusCodeOpt: Option[Int] - def updateCode(code: Int): Unit = - statusCodeOpt = Some(statusCodeOpt match { - case None => code - case Some(oldCode) => oldCode.max(code) - }) - - Incomplete.visitAll(cause.getCause) { - case _: CompileFailed => updateCode(StatusCode.Error) - case _: InterruptedException => updateCode(StatusCode.Cancelled) + cause.getCause match { + case _: CompileFailed => StatusCode.Error + case _: InterruptedException => StatusCode.Cancelled + case err => throw cause } - - statusCodeOpt.getOrElse(throw cause) } }