Run all commands properly on Windows, not just code

Author: smarter

project/Build.scala

@@ -15,7 +15,7 @@ import sbt.Package.ManifestAttributes
 import com.typesafe.sbteclipse.plugin.EclipsePlugin._
 
 import dotty.tools.sbtplugin.DottyPlugin.autoImport._
-import dotty.tools.sbtplugin.DottyIDEPlugin.runProcess
+import dotty.tools.sbtplugin.DottyIDEPlugin.{ prepareCommand, runProcess }
 import dotty.tools.sbtplugin.DottyIDEPlugin.autoImport._
 import org.scalajs.sbtplugin.ScalaJSPlugin
 import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
@@ -771,7 +771,7 @@ object Build {
           s"--extensionDevelopmentPath=$extensionPath" +:
             (if (inputArgs.isEmpty) List((baseDirectory.value / "..").getAbsolutePath) else inputArgs)
 
-        val clientCommand = codeCommand.value ++ codeArgs
+        val clientCommand = prepareCommand(codeCommand.value ++ codeArgs)
 
         val allArgs = "-client_command" +: clientCommand
 

sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala

@@ -124,8 +124,17 @@ object DottyIDEPlugin extends AutoPlugin {
     runTask(joinedTask, state)
   }
 
+  /** Prepare command to be passed to ProcessBuilder */
+  def prepareCommand(cmd: Seq[String]): Seq[String] =
+    if (isWin) Seq("cmd.exe", "/C") ++ cmd
+    else cmd
+
+  /** Run `cmd`.
+   *  @param wait  If true, wait for `cmd` to return and throw an exception if the exit code is non-zero.
+   *  @param directory  If not null, run `cmd` in this directory.
+   */
   def runProcess(cmd: Seq[String], wait: Boolean = false, directory: File = null): Unit = {
-    val pb0 = new ProcessBuilder(cmd: _*).inheritIO()
+    val pb0 = new ProcessBuilder(prepareCommand(cmd): _*).inheritIO()
     val pb = if (directory != null) pb0.directory(directory) else pb0
     if (wait) {
       val exitCode = pb.start().waitFor()
@@ -221,9 +230,7 @@ object DottyIDEPlugin extends AutoPlugin {
     commands ++= Seq(configureIDE, compileForIDE),
 
     codeCommand := {
-      if (isWin)
-        Seq("cmd.exe", "/C", "code", "-n")
-      else if (isMac)
+      if (isMac)
         Seq("open", "-a", "Visual Studio Code", "--args", "-n")
       else
         Seq("code", "-n")