Skip to content

Commit 586ae1c

Browse files
gersonsosatgodzik
authored andcommitted
fix: use system dependent separator in processorpath
1 parent a50ab5a commit 586ae1c

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

frontend/src/main/scala/bloop/data/Project.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,8 @@ object Project {
484484
if (hasProcessorPath(options)) {
485485
val (before, after) = options.splitAt(options.indexOf("-processorpath") + 1)
486486
if (!after.head.contains(pluginPath)) {
487-
before ::: s"${after.head}:$pluginPath" :: after.tail
487+
val pluginProcessorpath = Seq(after.head, pluginPath).mkString(java.io.File.pathSeparator)
488+
before ::: pluginProcessorpath :: after.tail
488489
} else options
489490
} else options
490491

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sbt.version=1.7.2

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -507,17 +507,17 @@ class BspMetalsClientSpec(
507507
javacOptions(javacOptions.indexOf("-processorpath") + 1).contains(javaSemanticDBJar)
508508
)
509509

510-
val compiledState = build.state.compile(project).toTestState
510+
val compiledState = build.state.compile(project)
511511
assert(compiledState.status == ExitStatus.Ok)
512512

513513
assertSemanticdbFileForProject(
514514
"/main/scala/example/Main.scala",
515-
compiledState,
515+
compiledState.toTestState,
516516
projectName
517517
)
518518
assertSemanticdbFileForProject(
519519
"/main/java/example/FoobarValueAnalyzer.java",
520-
compiledState,
520+
compiledState.toTestState,
521521
projectName
522522
)
523523
}

0 commit comments

Comments
 (0)