Merge pull request #116 from alexarchambault/merge-upstream

Merge upstream changes

Author: alexarchambault

frontend/src/test/scala/bloop/bsp/BspBaseSuite.scala

@@ -100,7 +100,7 @@ abstract class BspBaseSuite extends BaseSuite with BspClientTest {
     def findBuildTarget(project: TestProject): bsp.BuildTarget = {
       val workspaceTargetTask = {
         Workspace.buildTargets.request(bsp.WorkspaceBuildTargetsRequest()).map {
-          case Left(_) => fail("The request for build targets in ${state.build.origin} failed!")
+          case Left(_) => fail(s"The request for build targets in ${state.build.origin} failed!")
           case Right(ts) =>
             ts.targets.map(t => t.id -> t).find(_._1 == project.bspId) match {
               case Some((_, target)) => target
@@ -128,7 +128,7 @@ abstract class BspBaseSuite extends BaseSuite with BspClientTest {
         project: TestProject
     )(f: bsp.BuildTargetIdentifier => Task[T]): Task[T] = {
       Workspace.buildTargets.request(bsp.WorkspaceBuildTargetsRequest()).flatMap {
-        case Left(_) => fail("The request for build targets in ${state.build.origin} failed!")
+        case Left(_) => fail(s"The request for build targets in ${state.build.origin} failed!")
         case Right(ts) =>
           ts.targets.map(_.id).find(_ == project.bspId) match {
             case Some(target) => f(target)

frontend/src/test/scala/bloop/testing/BloopHelpers.scala

@@ -98,8 +98,7 @@ trait BloopHelpers {
       val all = files.map { f =>
         Task {
           val configFile = f.path.underlying
-          val oldWorkspace = AbsolutePath(baseDir)
-          loadTestProjectFromDisk(configFile, oldWorkspace.syntax, workspace.syntax)
+          loadTestProjectFromDisk(configFile, workspace.syntax)
         }
       }
 
@@ -117,25 +116,28 @@ trait BloopHelpers {
 
   private def loadTestProjectFromDisk(
       configFile: Path,
-      previousBaseDir: String,
       newBaseDir: String
   ): TestProject = {
     val bytes = Files.readAllBytes(configFile)
-    val contents = new String(bytes, StandardCharsets.UTF_8)
-    val newContents = contents.replace(previousBaseDir, newBaseDir)
-    import java.nio.file.StandardOpenOption
-    Files.write(
-      configFile,
-      newContents.getBytes(StandardCharsets.UTF_8),
-      StandardOpenOption.TRUNCATE_EXISTING,
-      StandardOpenOption.SYNC,
-      StandardOpenOption.WRITE
-    )
-
-    bloop.config.read(newContents.getBytes(StandardCharsets.UTF_8)) match {
+    val contents = new String(bytes)
+
+    bloop.config.read(contents.getBytes()).flatMap { cfg =>
+      import java.nio.file.StandardOpenOption
+      val previousBaseDir = cfg.project.workspaceDir.get.toString()
+      val newContents = contents.replace("\"" + previousBaseDir, "\"" + newBaseDir)
+      Files.write(
+        configFile,
+        newContents.getBytes,
+        StandardOpenOption.TRUNCATE_EXISTING,
+        StandardOpenOption.SYNC,
+        StandardOpenOption.WRITE
+      )
+      bloop.config.read(newContents.getBytes())
+    } match {
       case Left(error) => throw error
       case Right(file) => TestProject(file.project, None)
     }
+
   }
 
   final class TestState(val state: State) {