Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@ package scala.build.bloop

import ch.epfl.scala.bsp4j

import scala.build.bsp.ScalaDebugServer

trait BuildServer extends bsp4j.BuildServer with bsp4j.ScalaBuildServer with bsp4j.JavaBuildServer
with ScalaDebugServer
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package scala.build.bsp;
package scala.build.bloop;

import ch.epfl.scala.bsp4j.{DebugSessionAddress, DebugSessionParams}
import org.eclipse.lsp4j.jsonrpc.services.JsonRequest
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package scala.build.bsp
package scala.build.bloop

import ch.epfl.scala.{bsp4j => b}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import ch.epfl.scala.{bsp4j => b}
import java.util.concurrent.CompletableFuture

import scala.build.Logger
import scala.build.bloop.{ScalaDebugServer, ScalaDebugServerForwardStubs}
import scala.build.internal.Constants
import scala.build.options.Scope
import scala.concurrent.{Future, Promise}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,13 @@
[
"scala.build.bloop.BuildServer",
"org.eclipse.lsp4j.jsonrpc.Endpoint"
],
[
"scala.build.bloop.ScalaDebugServer",
"org.eclipse.lsp4j.jsonrpc.Endpoint"
],
[
"scala.build.bloop.ScalaDebugServerForwardStubs",
"org.eclipse.lsp4j.jsonrpc.Endpoint"
]
]
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,20 @@
"allDeclaredMethods": true,
"allDeclaredFields": true
},
{
"name": "scala.build.bloop.ScalaDebugServer",
"allDeclaredConstructors": true,
"allPublicConstructors": true,
"allDeclaredMethods": true,
"allDeclaredFields": true
},
{
"name": "scala.build.bloop.ScalaDebugServerForwardStubs",
"allDeclaredConstructors": true,
"allPublicConstructors": true,
"allDeclaredMethods": true,
"allDeclaredFields": true
},
{
"name": "scala.build.bloop.bloop4j.BloopExtraBuildParams",
"allDeclaredConstructors": true,
Expand Down
6 changes: 5 additions & 1 deletion modules/cli/src/main/scala/scala/cli/commands/SetupIde.scala
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,11 @@ object SetupIde extends ScalaCommand[SetupIdeOptions] {
}

val inputArgs = inputs.elements.collect {
case d: Inputs.OnDisk => d.path.toString
case d: Inputs.OnDisk =>
val path = d.path
if (os.isFile(path))
path.toString().stripSuffix(s"${path.last}")
else path.toString
}

val bspArgs =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
"bsp",
"--json-options",
(root / "directory" / ".scala" / "ide-options.json").toString,
(root / "directory" / "simple.sc").toString
s"${(root / "directory").toString}/"
)
expect(details.argv == expectedArgv)
}
Expand Down