From 1d3f4f103b221d4ab1a76e1866e49cd546666c1d Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Wed, 17 Feb 2021 14:12:54 +0100 Subject: [PATCH] Upgrade to Bloop 1.4.7 + remove -J prefix As of https://github.com/scalacenter/bloop/pull/1455 Bloop do not need the -J prefix on the jvmOptions. Also there is a plan to remove support for the -J prefix coming from debugSession/start request (https://github.com/scalacenter/bloop/issues/1456). --- build.sbt | 2 +- .../scala/meta/internal/metals/debug/DebugProvider.scala | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index e6f42d7db71..b1498f16459 100644 --- a/build.sbt +++ b/build.sbt @@ -186,7 +186,7 @@ lazy val V = new { val scalameta = "4.4.8" val semanticdb = scalameta val bsp = "2.0.0-M13" - val bloop = "1.4.6-40-6418e91f" + val bloop = "1.4.7" val scala3 = "3.0.0-M3" val bloopNightly = bloop val sbtBloop = bloop diff --git a/metals/src/main/scala/scala/meta/internal/metals/debug/DebugProvider.scala b/metals/src/main/scala/scala/meta/internal/metals/debug/DebugProvider.scala index 4eee631f1ce..f9389375bce 100644 --- a/metals/src/main/scala/scala/meta/internal/metals/debug/DebugProvider.scala +++ b/metals/src/main/scala/scala/meta/internal/metals/debug/DebugProvider.scala @@ -293,13 +293,6 @@ class DebugProvider( case json: JsonElement if parameters.getDataKind == b.DebugSessionParamsDataKind.SCALA_MAIN_CLASS => json.as[b.ScalaMainClass].foreach { main => - val translated = main.getJvmOptions().asScala.map { param => - if (!param.startsWith("-J")) - s"-J$param" - else - param - } - main.setJvmOptions(translated.asJava) if (main.getEnvironmentVariables() == null) { main.setEnvironmentVariables(Nil.asJava) }