From 0aa133d2762aad2ea3a52d77dbbbac8bdc3dc0f6 Mon Sep 17 00:00:00 2001
From: Steve Waldman <swaldman@mchange.com>
Date: Mon, 5 Feb 2018 23:11:42 -0800
Subject: [PATCH] Implement 'suppressServer' setting, for builds and plugins
 that prefer to be conservative about exposure to other processes.

---
 main-command/src/main/scala/sbt/BasicKeys.scala        | 6 ++++++
 main/src/main/scala/sbt/Defaults.scala                 | 1 +
 main/src/main/scala/sbt/Keys.scala                     | 1 +
 main/src/main/scala/sbt/Project.scala                  | 3 +++
 main/src/main/scala/sbt/internal/CommandExchange.scala | 7 ++++++-
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/main-command/src/main/scala/sbt/BasicKeys.scala b/main-command/src/main/scala/sbt/BasicKeys.scala
index 86dd9343f..a820515db 100644
--- a/main-command/src/main/scala/sbt/BasicKeys.scala
+++ b/main-command/src/main/scala/sbt/BasicKeys.scala
@@ -39,6 +39,12 @@ object BasicKeys {
                                  "The wire protocol for the server command.",
                                  10000)
 
+  val suppressServer =
+    AttributeKey[Boolean](
+      "suppressServer",
+      "Running the server will be suppressed if 'suppressServer is explicitly set to true.",
+      10000)
+
   // Unlike other BasicKeys, this is not used directly as a setting key,
   // and severLog / logLevel is used instead.
   private[sbt] val serverLogLevel =
diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 721e08914..35c9db19d 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -268,6 +268,7 @@ object Defaults extends BuildCommon {
         .getOrElse(GCUtil.defaultForceGarbageCollection),
       minForcegcInterval :== GCUtil.defaultMinForcegcInterval,
       interactionService :== CommandLineUIService,
+      suppressServer := false,
       serverHost := "127.0.0.1",
       serverPort := 5000 + (Hash
         .toHex(Hash(appConfiguration.value.baseDirectory.toString))
diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala
index bfcb3139e..1d32e2bb5 100644
--- a/main/src/main/scala/sbt/Keys.scala
+++ b/main/src/main/scala/sbt/Keys.scala
@@ -131,6 +131,7 @@ object Keys {
   // Command keys
   val historyPath = SettingKey(BasicKeys.historyPath)
   val shellPrompt = SettingKey(BasicKeys.shellPrompt)
+  val suppressServer = SettingKey(BasicKeys.suppressServer)
   val serverPort = SettingKey(BasicKeys.serverPort)
   val serverHost = SettingKey(BasicKeys.serverHost)
   val serverAuthentication = SettingKey(BasicKeys.serverAuthentication)
diff --git a/main/src/main/scala/sbt/Project.scala b/main/src/main/scala/sbt/Project.scala
index fd175f6c6..bd9fe8b0b 100755
--- a/main/src/main/scala/sbt/Project.scala
+++ b/main/src/main/scala/sbt/Project.scala
@@ -21,6 +21,7 @@ import Keys.{
   sessionSettings,
   shellPrompt,
   templateResolverInfos,
+  suppressServer,
   serverHost,
   serverLog,
   serverPort,
@@ -462,6 +463,7 @@ object Project extends ProjectExtra {
     val prompt = get(shellPrompt)
     val trs = (templateResolverInfos in Global get structure.data).toList.flatten
     val watched = get(watch)
+    val suppressSvr: Option[Boolean] = get(suppressServer)
     val host: Option[String] = get(serverHost)
     val port: Option[Int] = get(serverPort)
     val authentication: Option[Set[ServerAuthentication]] = get(serverAuthentication)
@@ -474,6 +476,7 @@ object Project extends ProjectExtra {
       s.attributes
         .setCond(Watched.Configuration, watched)
         .put(historyPath.key, history)
+        .setCond(suppressServer.key, suppressSvr)
         .setCond(serverPort.key, port)
         .setCond(serverHost.key, host)
         .setCond(serverAuthentication.key, authentication)
diff --git a/main/src/main/scala/sbt/internal/CommandExchange.scala b/main/src/main/scala/sbt/internal/CommandExchange.scala
index d7b52280d..eeadfad33 100644
--- a/main/src/main/scala/sbt/internal/CommandExchange.scala
+++ b/main/src/main/scala/sbt/internal/CommandExchange.scala
@@ -14,6 +14,7 @@ import java.util.concurrent.atomic._
 import scala.collection.mutable.ListBuffer
 import scala.annotation.tailrec
 import BasicKeys.{
+  suppressServer,
   serverHost,
   serverPort,
   serverAuthentication,
@@ -87,7 +88,11 @@ private[sbt] final class CommandExchange {
         consoleChannel = Some(x)
         subscribe(x)
     }
-    if (autoStartServer) runServer(s)
+    val suppress = (s get suppressServer) match {
+      case Some(bool) => bool
+      case None       => false
+    }
+    if (autoStartServer && !suppress) runServer(s)
     else s
   }