From 946b54c858d6d95e759e7141177b2af807813306 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 3 Mar 2025 22:19:22 -0500 Subject: [PATCH] Skip retry on CompileCancelled **Problem** When compilation fails, it's retrying 10 times since Retry now retries on non-IOExceptions. **Solution** This adds CompileFailed to excluded exception list. --- build.sbt | 2 +- main/src/main/scala/sbt/internal/server/BspCompileTask.scala | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index c2b7db293..7bc842fac 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ import scala.util.Try // ThisBuild settings take lower precedence, // but can be shared across the multi projects. ThisBuild / version := { - val v = "1.10.8-SNAPSHOT" + val v = "1.10.10-SNAPSHOT" nightlyVersion.getOrElse(v) } ThisBuild / version2_13 := "2.0.0-SNAPSHOT" diff --git a/main/src/main/scala/sbt/internal/server/BspCompileTask.scala b/main/src/main/scala/sbt/internal/server/BspCompileTask.scala index 205b11b57..ed784f244 100644 --- a/main/src/main/scala/sbt/internal/server/BspCompileTask.scala +++ b/main/src/main/scala/sbt/internal/server/BspCompileTask.scala @@ -16,6 +16,7 @@ import sbt.internal.server.BspCompileTask.exchange import sbt.librarymanagement.Configuration import sbt.util.InterfaceUtil import sjsonnew.support.scalajson.unsafe.Converter +import xsbti.CompileCancelled import xsbti.CompileFailed import xsbti.Problem import xsbti.Severity @@ -38,7 +39,7 @@ object BspCompileTask { val task = BspCompileTask(targetId, project, config, ci) try { task.notifyStart() - val result = Retry(compile(task)) + val result = Retry(compile(task), classOf[CompileCancelled], classOf[CompileFailed]) task.notifySuccess(result) result } catch {