!fixup add -sourceroot

Author: Blaine Freestone

src/main/scala/higherkindness/rules_scala/workers/zinc/compile/FilteredSetup.scala

@@ -4,16 +4,15 @@ import xsbti.compile.{CompileOptions, MiniSetup}
 import java.nio.file.{Path, Paths}
 
 /**
- * Zinc's MiniSetup contains scalacOptions which include the -sourceroot flag that references
- * absolute sandbox paths. These paths are non-deterministic across builds because the sandbox
- * directory changes (e.g., __sandbox/4/_main vs __sandbox/8/_main), making the analysis files
- * non-deterministic.
+ * Zinc's MiniSetup contains scalacOptions which include the -sourceroot flag that references absolute sandbox paths.
+ * These paths are non-deterministic across builds because the sandbox directory changes (e.g., __sandbox/4/_main vs
+ * __sandbox/8/_main), making the analysis files non-deterministic.
  *
- * This class filters out the -sourceroot option from the scalacOptions to ensure deterministic
- * analysis files.
+ * This class filters out the -sourceroot option from the scalacOptions to ensure deterministic analysis files.
  *
  * TODO: Consider if there's a better way to handle this upstream in Zinc
  */
+
 object FilteredSetup {
   private val sourcerootFlag = "-sourceroot"
 
@@ -24,7 +23,6 @@ object FilteredSetup {
     val filteredScalacOptions = {
       val originalOptions = options.scalacOptions()
       val filtered = scala.collection.mutable.ArrayBuffer[String]()
-      
       var i = 0
       while (i < originalOptions.length) {
         val option = originalOptions(i)
@@ -36,7 +34,6 @@ object FilteredSetup {
           i += 1
         }
       }
-      
       filtered.toArray
     }
 

src/main/scala/higherkindness/rules_scala/workers/zinc/compile/ZincRunner.scala

@@ -216,21 +216,21 @@ object ZincRunner extends WorkerMain[ZincRunnerWorkerConfig] {
       scalaInstance.actualVersion.startsWith("3")
 
     val scalacOptions =
-      workRequest.plugins.view.map(p => s"-Xplugin:$p").toArray ++
-      workRequest.compilerOptions ++
-      workRequest.compilerOptionsReferencingPaths.toArray ++
-      (if (shouldIncludeSourceRoot)
-        Array("-sourceroot", task.workDir.toAbsolutePath().toString)
-      else
-        Array.empty[String])
+        workRequest.plugins.view.map(p => s"-Xplugin:$p").toArray ++
+        workRequest.compilerOptions ++
+        workRequest.compilerOptionsReferencingPaths.toArray ++
+        (if (shouldIncludeSourceRoot)
+          Array("-sourceroot", task.workDir.toAbsolutePath().toString)
+        else
+          Array.empty[String])
 
     val compileOptions =
       CompileOptions.create
-      .withSources(sources.view.map(source => PlainVirtualFile(source.toAbsolutePath().normalize())).toArray)
-      .withClasspath((classesOutputDir +: deps.view.map(_.classpath)).map(path => PlainVirtualFile(path)).toArray)
-      .withClassesDirectory(classesOutputDir)
-      .withJavacOptions(workRequest.javaCompilerOptions)
-      .withScalacOptions(scalacOptions)
+        .withSources(sources.view.map(source => PlainVirtualFile(source.toAbsolutePath().normalize())).toArray)
+        .withClasspath((classesOutputDir +: deps.view.map(_.classpath)).map(path => PlainVirtualFile(path)).toArray)
+        .withClassesDirectory(classesOutputDir)
+        .withJavacOptions(workRequest.javaCompilerOptions)
+        .withScalacOptions(scalacOptions)
 
     val compilers = {
       val scalaCompiler = ZincUtil