Replace String with Path

scalacenter · Mar 13, 2020 · ce22610 · ce22610
1 parent 304b2ff
commit ce22610
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/config/src/main/scala/bloop/config/Config.scala b/config/src/main/scala/bloop/config/Config.scala
@@ -234,7 +234,7 @@ object Config {
       workspaceDir: Option[Path],
       sources: List[Path],
       sourcesGlobs: Option[List[SourcesGlobs]],
-      sourceRoots: Option[List[String]],
+      sourceRoots: Option[List[Path]],
       dependencies: List[String],
       classpath: List[Path],
       out: Path,

diff --git a/frontend/src/main/scala/bloop/bsp/BloopBspServices.scala b/frontend/src/main/scala/bloop/bsp/BloopBspServices.scala
@@ -947,7 +947,7 @@ final class BloopBspServices(
               // TODO(jvican): Don't default on false for generated, add this info to JSON fields
               bsp.SourceItem(bsp.Uri(bspUri), kind, false)
             }
-            val roots = project.sourceRoots.map(_.map(bsp.Uri(_)))
+            val roots = project.sourceRoots.map(_.map(p => bsp.Uri(p.toBspUri)))
             bsp.SourcesItem(target, items, roots)
           }
       }.toList

diff --git a/frontend/src/main/scala/bloop/data/Project.scala b/frontend/src/main/scala/bloop/data/Project.scala
@@ -44,7 +44,7 @@ final case class Project(
     javacOptions: List[String],
     sources: List[AbsolutePath],
     sourcesGlobs: List[SourcesGlobs],
-    sourceRoots: Option[List[String]],
+    sourceRoots: Option[List[AbsolutePath]],
     testFrameworks: List[Config.TestFramework],
     testOptions: Config.TestOptions,
     out: AbsolutePath,
@@ -235,6 +235,8 @@ object Project {
       .getOrElse(out.resolve(Config.Project.analysisFileName(project.name)))
     val resources = project.resources.toList.flatten.map(AbsolutePath.apply)
 
+    val sourceRoots = project.sourceRoots.map(_.map(AbsolutePath.apply))
+
     Project(
       project.name,
       AbsolutePath(project.directory),
@@ -249,7 +251,7 @@ object Project {
       project.java.map(_.options).getOrElse(Nil),
       project.sources.map(AbsolutePath.apply),
       SourcesGlobs.fromConfig(project, logger),
-      project.sourceRoots,
+      sourceRoots,
       project.test.map(_.frameworks).getOrElse(Nil),
       project.test.map(_.options).getOrElse(Config.TestOptions.empty),
       AbsolutePath(project.out),

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -13,7 +13,7 @@ object Dependencies {
   val nailgunCommit = "a2520c1e"
 
   val zincVersion = "1.3.0-M4+32-b1accb96"
-  val bspVersion = "2.0.0-M5" // TODO bump bsp to make it compile
+  val bspVersion = "2.0.0-M7"
   val javaDebugVersion = "0.21.0+1-7f1080f1"
 
   val scalazVersion = "7.2.20"