From 5f0852818bcda9d03a27afa7cd2bac0a6fdb2f70 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Fri, 15 Dec 2017 01:43:12 +0000
Subject: [PATCH] Add project id to watching message

We redefine watchingMessage in project scope so we can use
thisProjectRef to make the watching message more precise.

Fixes #2038
---
 main-command/src/main/scala/sbt/Watched.scala     | 13 +++++++++----
 main/src/main/scala/sbt/Defaults.scala            |  1 +
 notes/1.2.0/add-project-id-to-watching-message.md | 12 ++++++++++++
 notes/{1.0.2 => }/sample.md                       |  0
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 notes/1.2.0/add-project-id-to-watching-message.md
 rename notes/{1.0.2 => }/sample.md (100%)

diff --git a/main-command/src/main/scala/sbt/Watched.scala b/main-command/src/main/scala/sbt/Watched.scala
index fa1dee03f..1960a337b 100644
--- a/main-command/src/main/scala/sbt/Watched.scala
+++ b/main-command/src/main/scala/sbt/Watched.scala
@@ -44,8 +44,13 @@ trait Watched {
 }
 
 object Watched {
-  val defaultWatchingMessage
-    : WatchState => String = _.count + ". Waiting for source changes... (press enter to interrupt)"
+  val defaultWatchingMessage: WatchState => String = ws =>
+    s"${ws.count}. Waiting for source changes... (press enter to interrupt)"
+
+  def projectWatchingMessage(projectId: String): WatchState => String =
+    ws =>
+      s"${ws.count}. Waiting for source changes in project $projectId... (press enter to interrupt)"
+
   val defaultTriggeredMessage: WatchState => String = const("")
   val clearWhenTriggered: WatchState => String = const(clearScreen)
   def clearScreen: String = "\u001b[2J\u001b[0;0H"
@@ -70,8 +75,8 @@ object Watched {
      * @param base          The base directory from which to include files.
      * @return An instance of `Source`.
      */
-    def apply(base: File): Source =
-      apply(base, AllPassFilter, NothingFilter)
+    def apply(base: File): Source = apply(base, AllPassFilter, NothingFilter)
+
   }
 
   private[this] class AWatched extends Watched
diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 1f2dcfd3a..912cd2a50 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -530,6 +530,7 @@ object Defaults extends BuildCommon {
     clean := (Def.task { IO.delete(cleanFiles.value) } tag (Tags.Clean)).value,
     consoleProject := consoleProjectTask.value,
     watchTransitiveSources := watchTransitiveSourcesTask.value,
+    watchingMessage := Watched.projectWatchingMessage(thisProjectRef.value.project),
     watch := watchSetting.value
   )
 
diff --git a/notes/1.2.0/add-project-id-to-watching-message.md b/notes/1.2.0/add-project-id-to-watching-message.md
new file mode 100644
index 000000000..7c6a1bf57
--- /dev/null
+++ b/notes/1.2.0/add-project-id-to-watching-message.md
@@ -0,0 +1,12 @@
+[@dwijnand]: https://github.com/dwijnand
+
+[#2038]: https://github.com/sbt/sbt/issues/2038
+[#3813]: https://github.com/sbt/sbt/pull/3813
+
+### Fixes with compatibility implications
+
+### Improvements
+
+- Add the current project's id to `~`'s watching message.  [#2038][]/[#3813][] by [@dwijnand][]
+
+### Bug fixes
diff --git a/notes/1.0.2/sample.md b/notes/sample.md
similarity index 100%
rename from notes/1.0.2/sample.md
rename to notes/sample.md