From b7e037adbbf3a0e33a97384849fc6803e17f0118 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Thu, 22 Aug 2024 01:49:49 -0400
Subject: [PATCH] Use VirtualFileRef of the classes directory

---
 main/src/main/scala/sbt/Defaults.scala                |  3 ++-
 main/src/main/scala/sbt/internal/CompileInputs2.scala | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index e4163d004..8f08d1c4a 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -2702,12 +2702,13 @@ object Defaults extends BuildCommon {
       compileInputs2 := {
         val cp0 = classpathTask.value
         val inputs = compileInputs.value
+        val c = fileConverter.value
         CompileInputs2(
           data(cp0).toVector,
           inputs.options.sources.toVector,
           scalacOptions.value.toVector,
           javacOptions.value.toVector,
-          outputPath.value + prefix(configuration.value.name),
+          c.toVirtualFile(inputs.options.classesDirectory),
         )
       },
       bspCompileTask :=
diff --git a/main/src/main/scala/sbt/internal/CompileInputs2.scala b/main/src/main/scala/sbt/internal/CompileInputs2.scala
index 199140f9d..923f1fcb2 100644
--- a/main/src/main/scala/sbt/internal/CompileInputs2.scala
+++ b/main/src/main/scala/sbt/internal/CompileInputs2.scala
@@ -2,7 +2,7 @@ package sbt.internal
 
 import scala.reflect.ClassTag
 import sjsonnew.*
-import xsbti.HashedVirtualFileRef
+import xsbti.{ HashedVirtualFileRef, VirtualFileRef }
 
 // CompileOption has the list of sources etc
 case class CompileInputs2(
@@ -10,7 +10,7 @@ case class CompileInputs2(
     sources: Vector[HashedVirtualFileRef],
     scalacOptions: Vector[String],
     javacOptions: Vector[String],
-    relativeOutputPath: String,
+    outputPath: VirtualFileRef,
 )
 
 object CompileInputs2:
@@ -19,7 +19,7 @@ object CompileInputs2:
   given IsoLList.Aux[
     CompileInputs2,
     Vector[HashedVirtualFileRef] :*: Vector[HashedVirtualFileRef] :*: Vector[String] :*:
-      Vector[String] :*: String :*: LNil
+      Vector[String] :*: VirtualFileRef :*: LNil
   ] =
     LList.iso(
       { (v: CompileInputs2) =>
@@ -27,12 +27,12 @@ object CompileInputs2:
           ("sources", v.sources) :*:
           ("scalacOptions", v.scalacOptions) :*:
           ("javacOptions", v.javacOptions) :*:
-          ("relativeOutputPath", v.relativeOutputPath) :*:
+          ("outputPath", v.outputPath) :*:
           LNil
       },
       {
         (in: Vector[HashedVirtualFileRef] :*: Vector[HashedVirtualFileRef] :*: Vector[String] :*:
-          Vector[String] :*: String :*: LNil) =>
+          Vector[String] :*: VirtualFileRef :*: LNil) =>
           CompileInputs2(
             in.head,
             in.tail.head,