From f4c49a09d272799a21fa6a942e9a598575423be9 Mon Sep 17 00:00:00 2001
From: Ethan Atkins <contact@ethanatkins.com>
Date: Thu, 17 Sep 2020 19:35:24 -0700
Subject: [PATCH] Filter out DashDashServer for command arguments

sbt exits abruptly when run with --server.
---
 main/src/main/scala/sbt/Main.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala
index 95ca729a5..3e08c60a4 100644
--- a/main/src/main/scala/sbt/Main.scala
+++ b/main/src/main/scala/sbt/Main.scala
@@ -227,11 +227,11 @@ object StandardMain {
     // This is to workaround https://github.com/sbt/io/issues/110
     sys.props.put("jna.nosys", "true")
 
-    import BasicCommandStrings.isEarlyCommand
+    import BasicCommandStrings.{ DashDashDetachStdio, DashDashServer, isEarlyCommand }
     val userCommands =
       configuration.arguments
         .map(_.trim)
-        .filterNot(_ == BasicCommandStrings.DashDashDetachStdio)
+        .filterNot(c => c == DashDashDetachStdio || c == DashDashServer)
     val (earlyCommands, normalCommands) = (preCommands ++ userCommands).partition(isEarlyCommand)
     val commands = (earlyCommands ++ normalCommands).toList map { x =>
       Exec(x, None)