From b965277edc0ecb9932629bb96c9bb81c27f39fd3 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Thu, 28 Aug 2025 23:44:17 -0400
Subject: [PATCH] fix: Fixes set command

**Problem**
Once set command fails, the error state carries over to the next.

**Solution**
Create a fresh driver with a fresh reporter.
---
 buildfile/src/main/scala/sbt/internal/Eval.scala | 13 +++++++------
 sbt-app/src/sbt-test/actions/set/test            |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/buildfile/src/main/scala/sbt/internal/Eval.scala b/buildfile/src/main/scala/sbt/internal/Eval.scala
index 266273a47..7c8622e18 100644
--- a/buildfile/src/main/scala/sbt/internal/Eval.scala
+++ b/buildfile/src/main/scala/sbt/internal/Eval.scala
@@ -44,12 +44,8 @@ class Eval(
   private val classpathString = (backingDir.toList ++ classpath)
     .map(_.toString)
     .mkString(java.io.File.pathSeparator)
-  private lazy val driver: EvalDriver = new EvalDriver
-  private lazy val reporter: EvalReporter = mkReporter match
-    case Some(f) => f()
-    case None    => EvalReporter.store
 
-  final class EvalDriver extends Driver:
+  final class EvalDriver(reporter: EvalReporter) extends Driver:
     val compileCtx0 = initCtx.fresh
     val options = nonCpOptions ++ Seq("-classpath", classpathString, "dummy.scala")
     val compileCtx1 = setup(options.toArray, compileCtx0) match
@@ -203,6 +199,9 @@ class Eval(
     val d = digester.digest()
     val hash = Hash.toHex(d)
     val moduleName = makeModuleName(hash)
+    val reporter: EvalReporter = mkReporter match
+      case Some(f) => f()
+      case None    => EvalReporter.store
     val (extra, loader) =
       try
         backingDir match
@@ -211,7 +210,7 @@ class Eval(
               (new URLClassLoader(Array(backing.toUri.toURL), parent): ClassLoader)
             val extra = ev.read(cacheFile(backing, moduleName))
             (extra, loader)
-          case _ => compileAndLoad(ev, moduleName)
+          case _ => compileAndLoad(ev, moduleName, reporter)
       finally reporter.finalReport(ev.sourceName)
     val generatedFiles = getGeneratedFiles(moduleName)
     EvalIntermediate(
@@ -228,7 +227,9 @@ class Eval(
   private def compileAndLoad[A](
       ev: EvalType[A],
       moduleName: String,
+      reporter: EvalReporter,
   ): (A, ClassLoader => ClassLoader) =
+    val driver: EvalDriver = new EvalDriver(reporter)
     given rootCtx: Context = driver.compileCtx
     val run = driver.compiler.newRun
     val source = ev.makeSource(moduleName)
diff --git a/sbt-app/src/sbt-test/actions/set/test b/sbt-app/src/sbt-test/actions/set/test
index b50fd83e1..7478ac0c4 100644
--- a/sbt-app/src/sbt-test/actions/set/test
+++ b/sbt-app/src/sbt-test/actions/set/test
@@ -1,3 +1,4 @@
+-> set notExistsKey := 42
 > helloWorldTest
 > buildSbtTest
 > evilClearLogger