Skip to content

Commit

Permalink
Update Bloop to the newest nightly
Browse files Browse the repository at this point in the history
  • Loading branch information
tgodzik committed Aug 2, 2021
1 parent fadc777 commit 13597e0
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ lazy val V = new {
val scalameta = "4.4.24"
val semanticdb = scalameta
val bsp = "2.0.0-M13"
val bloop = "1.4.8-19-4d9f966b"
val bloop = "1.4.8-90-77e59d70"
val scala3 = "3.0.1"
val nextScala3RC = "3.0.2-RC1"
val bloopNightly = bloop
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ case class MavenBuildTool(userConfig: () => UserConfiguration)
def bloopInstallArgs(workspace: AbsolutePath): List[String] = {
def command(versionToUse: String) =
List(
s"ch.epfl.scala:maven-bloop_2.12:$versionToUse:bloopInstall",
s"ch.epfl.scala:maven-bloop_2.13:$versionToUse:bloopInstall",
"-DdownloadSources=true"
)
userConfig().mavenScript match {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ final class Debugger(server: RemoteServer)(implicit ec: ExecutionContext) {
def disconnect: Future[Unit] = {
val args = new DisconnectArguments
args.setRestart(false)
args.setTerminateDebuggee(false)
server.disconnect(args).asScala.ignoreValue
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ final class TestDebugger(
}

def disconnect: Future[Unit] = {
ifNotFailed(debugger.disconnect)
ifNotFailed(debugger.disconnect).map(_ => terminated.trySuccess(()))
}

/**
Expand Down
4 changes: 1 addition & 3 deletions tests/unit/src/test/scala/tests/DebugProtocolSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,13 @@ class DebugProtocolSuite extends BaseDapSuite("debug-protocol") {
_ <- debugger.awaitOutput("Foo\n")

_ <- server.didSave("a/src/main/scala/a/Main.scala")(
_.replaceAll("Foo", "Bar")
_.replace("Foo", "Bar").replace("synchronized(wait())", "")
)
_ <- debugger.restart

_ <- debugger.initialize
_ <- debugger.launch
_ <- debugger.configurationDone
_ <- debugger.awaitOutput("Bar\n")
_ <- debugger.disconnect
_ <- debugger.shutdown
output <- debugger.allOutput
} yield assertNoDiff(output, "Bar\n")
Expand Down
20 changes: 15 additions & 5 deletions tests/unit/src/test/scala/tests/debug/StackFrameDapSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@ class StackFrameDapSuite extends BaseDapSuite("debug-stack-frame") {
| }
|}""".stripMargin,
expectedFrames = List(
Variables(Scope.local(Variable("value: int = 1"))),
Variables(Scope.local(Variable("value: int = 2")))
Variables(
Scope.local(Variable("MODULE$: Main$"), Variable("value: int = 1"))
),
Variables(
Scope.local(Variable("MODULE$: Main$"), Variable("value: int = 2"))
)
)
)

Expand Down Expand Up @@ -97,12 +101,18 @@ class StackFrameDapSuite extends BaseDapSuite("debug-stack-frame") {
|""".stripMargin,
expectedFrames = List(
Variables( // before calculating `z`
Scope.local(Variable("x: int = 1"))
Scope.local(Variable("MODULE$: Main$"), Variable("x: int = 1"))
),
Variables( // after calculating `z`
Scope.local(Variable("x: int = 1"), Variable("z: int = 3"))
Scope.local(
Variable("MODULE$: Main$"),
Variable("x: int = 1"),
Variable("z: int = 3")
)
),
Variables(Scope.local(Variable("x$1: Tuple2$mcII$sp")))
Variables(
Scope.local(Variable("MODULE$: Main$"), Variable("x$1: Tuple2$mcII$sp"))
)
)
)

Expand Down

0 comments on commit 13597e0

Please sign in to comment.