From fe84bc931a3e775aa1152492f992426ab5bff0ba Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 1 Nov 2018 01:46:28 +0100 Subject: [PATCH 1/2] sbt-dotty: fix extension upgrade on Windows When using --install-extension and an upgraded version of the extension exists online, the user normally gets a prompt to accept or reject the upgrade. Using --force we bypass this prompt and we also fix an issue with Windows where the prompt does not appear and we get the error "Unknown stdin file type" instead. --- sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala b/sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala index 4d5dd8348fd8..cfd029fb8ca2 100644 --- a/sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala +++ b/sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala @@ -197,7 +197,7 @@ object DottyIDEPlugin extends AutoPlugin { */ def installCodeExtension(codeCmd: Seq[String], name: String): Unit = { try { - runProcess(codeCmd ++ Seq("--install-extension", name), wait = true) + runProcess(codeCmd ++ Seq("--force", "--install-extension", name), wait = true) } catch { case e: Exception => var alreadyInstalled: Boolean = false From 42888f5e48a09d9a2afa485856a56b8e7ac49a91 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 1 Nov 2018 02:01:16 +0100 Subject: [PATCH 2/2] sbt-dotty: Bump to 0.2.7-SNAPSHOT --- project/Build.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 459e1634b85d..a43f8ee96215 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -37,14 +37,14 @@ object Build { val scalacVersion = "2.12.7" val baseVersion = "0.11.0" - val baseSbtDottyVersion = "0.2.6" + val baseSbtDottyVersion = "0.2.7" // Versions used by the vscode extension to create a new project // This should be the latest published releases. // TODO: Have the vscode extension fetch these numbers from the Internet // instead of hardcoding them ? val publishedDottyVersion = "0.11.0-bin-20181031-5a465af-NIGHTLY" // Using a nightly for now to get worksheet support - val publishedSbtDottyVersion = "0.2.5" + val publishedSbtDottyVersion = "0.2.6" val dottyOrganization = "ch.epfl.lamp"