Skip to content

Commit 4e99ab6

Browse files
kasiaMarektgodzik
authored andcommitted
fix: allow for spaces in project name
1 parent c461924 commit 4e99ab6

5 files changed

Lines changed: 9 additions & 5 deletions

File tree

backend/src/main/scala/bloop/Compiler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import java.util.concurrent.Executor
88

99
import scala.collection.mutable
1010
import scala.concurrent.Promise
11-
import scala.util.control.NonFatal
11+
import scala.util.Try
1212

1313
import bloop.io.AbsolutePath
1414
import bloop.io.ParallelOps

frontend/src/main/scala/bloop/bsp/ProjectUris.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package bloop.bsp
22

33
import java.net.URI
4+
import java.net.URLDecoder
5+
import java.nio.charset.StandardCharsets
46
import java.nio.file.Path
57

68
import scala.util.Try
@@ -21,7 +23,9 @@ object ProjectUris {
2123
Left(s"URI '${projectUri}' has invalid format. Example: ${ProjectUris.Example}")
2224
case Right(parsed) =>
2325
parsed.headOption match {
24-
case Some(Array("id", projectName)) => Right(state.build.getProjectFor(projectName))
26+
case Some(Array("id", projectName)) =>
27+
val name = URLDecoder.decode(projectName, StandardCharsets.UTF_8)
28+
Right(state.build.getProjectFor(name))
2529
case _ =>
2630
Left(s"URI '${projectUri}' has invalid format. Example: ${ProjectUris.Example}")
2731
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import scala.collection.mutable
1111
import scala.util.control.NonFatal
1212
import scala.util.matching.Regex
1313

14+
import bloop.ClientClassesObserver
1415
import bloop.io.AbsolutePath
1516
import bloop.io.Filenames
1617
import bloop.io.Paths
1718
import bloop.util.UUIDUtil
18-
import bloop.ClientClassesObserver
1919

2020
sealed trait ClientInfo {
2121

frontend/src/main/scala/bloop/engine/tasks/compilation/CompileBundle.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package bloop.engine.tasks.compilation
22

33
import scala.concurrent.Promise
44

5+
import bloop.ClientClassesObserver
56
import bloop.CompileOutPaths
67
import bloop.Compiler
78
import bloop.ScalaInstance
@@ -23,7 +24,6 @@ import bloop.tracing.BraveTracer
2324

2425
import monix.reactive.Observable
2526
import sbt.internal.inc.PlainVirtualFileConverter
26-
import bloop.ClientClassesObserver
2727

2828
sealed trait CompileBundle
2929

frontend/src/main/scala/bloop/engine/tasks/toolchains/ScalaNativeToolchain.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package bloop.engine.tasks.toolchains
33
import java.lang.reflect.InvocationTargetException
44
import java.nio.file.Path
55

6+
import scala.concurrent.Future
67
import scala.util.Try
78

89
import bloop.DependencyResolution
@@ -14,7 +15,6 @@ import bloop.internal.build.BuildInfo
1415
import bloop.io.AbsolutePath
1516
import bloop.logging.Logger
1617
import bloop.task.Task
17-
import scala.concurrent.Future
1818

1919
final class ScalaNativeToolchain private (classLoader: ClassLoader) {
2020

0 commit comments

Comments
 (0)