From 7dfe6097fbcd53f98457573f2205c2668c8306bc Mon Sep 17 00:00:00 2001
From: Alexander Samsig <koresamsig@gmail.com>
Date: Tue, 15 May 2018 12:13:51 +0200
Subject: [PATCH] Removed Load and LoadCommand since they are no longer in use.
 Changed add-defaults-commands directly since it is only used internally.
 Added deprecation warning for LoadFailed and LastGrep.

---
 main/src/main/scala/sbt/Main.scala            | 29 ++++++++++++++++---
 .../scala/sbt/internal/CommandStrings.scala   | 10 ++-----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala
index ac1ad03be..2117f26f0 100644
--- a/main/src/main/scala/sbt/Main.scala
+++ b/main/src/main/scala/sbt/Main.scala
@@ -187,6 +187,7 @@ object BuiltinCommands {
       inspect,
       loadProjectImpl,
       loadFailed,
+      oldLoadFailed,
       Cross.crossBuild,
       Cross.switchVersion,
       PluginCross.pluginCross,
@@ -468,13 +469,21 @@ object BuiltinCommands {
 
   @deprecated("Use `lastGrep` instead.", "1.2.0")
   def oldLastGrep: Command =
-    lastGrepCommand(OldLastGrepCommand, oldLastGrepBrief, oldLastGrepDetailed)
+    lastGrepCommand(OldLastGrepCommand, oldLastGrepBrief, oldLastGrepDetailed, { s =>
+      s.log.warn(deprecationWarningText(OldLastGrepCommand, LastGrepCommand))
+      lastGrepParser(s)
+    })
 
   def lastGrep: Command =
-    lastGrepCommand(LastGrepCommand, lastGrepBrief, lastGrepDetailed)
+    lastGrepCommand(LastGrepCommand, lastGrepBrief, lastGrepDetailed, lastGrepParser)
 
-  private def lastGrepCommand(name: String, briefHelp: (String, String), detail: String): Command =
-    Command(name, briefHelp, detail)(lastGrepParser) {
+  private def lastGrepCommand(
+      name: String,
+      briefHelp: (String, String),
+      detail: String,
+      parser: State => Parser[(String, Option[AnyKeys])]
+  ): Command =
+    Command(name, briefHelp, detail)(parser) {
       case (s, (pattern, Some(sks))) =>
         val (str, _, display) = extractLast(s)
         Output.lastGrep(sks, str.streams(s), pattern, printLast)(display)
@@ -670,6 +679,18 @@ object BuiltinCommands {
     Command.make(ProjectCommand, projectBrief, projectDetailed)(ProjectNavigation.command)
 
   def loadFailed: Command = Command(LoadFailed)(loadProjectParser)(doLoadFailed)
+  @deprecated("Use `loadFailed` instead.", "1.2.0")
+  def oldLoadFailed: Command =
+    Command(OldLoadFailed) { s =>
+      s.log.warn(
+        deprecationWarningText(OldLoadFailed, LoadFailed)
+      )
+      loadProjectParser(s)
+    }(doLoadFailed)
+
+  private[this] def deprecationWarningText(oldCommand: String, newCommand: String) = {
+    s"The `$oldCommand` command is deprecated in favor of `$newCommand` and will be removed in a later version"
+  }
 
   @tailrec
   private[this] def doLoadFailed(s: State, loadArg: String): State = {
diff --git a/main/src/main/scala/sbt/internal/CommandStrings.scala b/main/src/main/scala/sbt/internal/CommandStrings.scala
index 1239cc034..99ec4637e 100644
--- a/main/src/main/scala/sbt/internal/CommandStrings.scala
+++ b/main/src/main/scala/sbt/internal/CommandStrings.scala
@@ -280,16 +280,12 @@ $ProjectsCommand remove <URI>+
 
   def sbtrc = ".sbtrc"
 
-  def DefaultsCommand = "add-default-commands"
+  def DefaultsCommand = "addDefaultCommands"
   def DefaultsBrief = (DefaultsCommand, DefaultsDetailed)
   def DefaultsDetailed = "Registers default built-in commands"
 
-  def Load = "load"
-  def LoadLabel = "a project"
-  def LoadCommand = "load-commands"
-  def LoadCommandLabel = "commands"
-
-  def LoadFailed = "load-failed"
+  def LoadFailed = "loadFailed"
+  def OldLoadFailed = "load-failed"
 
   def LoadProjectImpl = "loadp"
   def LoadProject = "reload"