From d62a7465ae3b5da2179d0e682fc472203295f9d6 Mon Sep 17 00:00:00 2001
From: Anthony Garo <agaro1121@gmail.com>
Date: Tue, 19 Jun 2018 11:55:57 -0400
Subject: [PATCH] Addresses #4206

---
 main/src/main/scala/sbt/Defaults.scala | 2 ++
 main/src/main/scala/sbt/Keys.scala     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index d1db1af98..bd28131d9 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -559,6 +559,8 @@ object Defaults extends BuildCommon {
     mainClass := pickMainClassOrWarn(discoveredMainClasses.value, streams.value.log),
     runMain := foregroundRunMainTask.evaluated,
     run := foregroundRunTask.evaluated,
+    fgRun := runTask(fullClasspath, mainClass in run, runner in run).evaluated,
+    fgRunMain := runMainTask(fullClasspath, runner in run).evaluated,
     copyResources := copyResourcesTask.value,
     // note that we use the same runner and mainClass as plain run
     mainBgRunMainTaskForConfig(This),
diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala
index 45d9c2d96..10dfa7361 100644
--- a/main/src/main/scala/sbt/Keys.scala
+++ b/main/src/main/scala/sbt/Keys.scala
@@ -286,7 +286,9 @@ object Keys {
   val bgStop = inputKey[Unit]("Stop a background job by providing its ID.")
   val bgWaitFor = inputKey[Unit]("Wait for a background job to finish by providing its ID.")
   val bgRun = inputKey[JobHandle]("Start an application's default main class as a background job")
+  val fgRun = inputKey[Unit]("Start an application's default main class as a foreground job")
   val bgRunMain = inputKey[JobHandle]("Start a provided main class as a background job")
+  val fgRunMain = inputKey[Unit]("Start a provided main class as a foreground job")
   val bgCopyClasspath = settingKey[Boolean]("Copies classpath on bgRun to prevent conflict.")
 
   // Test Keys