From 90d0c54caa9147b41a6d2f110d73757b8a934015 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Wed, 29 May 2019 19:48:01 -0700 Subject: [PATCH] Set watchTriggeredMessage by default This allows the user to do, for example, watchTriggeredMessage := { (count, path, commands) => println(Watched.clearScreen) watchTriggeredMessage.value(count, path, commands) } Also, there was a bug where I accidentally inadvertently used the deprecated watch message setting where I meant to use the deprecated trigger message setting. Fixes #4696 --- main/src/main/scala/sbt/Defaults.scala | 1 + main/src/main/scala/sbt/internal/Continuous.scala | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 283822291..7975d71e1 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -154,6 +154,7 @@ object Defaults extends BuildCommon { inputFileStamper :== sbt.nio.FileStamper.Hash, outputFileStamper :== sbt.nio.FileStamper.LastModified, onChangedBuildSource :== sbt.nio.Keys.WarnOnSourceChanges, + watchTriggeredMessage :== sbt.nio.Watch.defaultOnTriggerMessage, watchForceTriggerOnAnyChange :== false, watchPersistFileStamps :== true, watchTriggers :== Nil, diff --git a/main/src/main/scala/sbt/internal/Continuous.scala b/main/src/main/scala/sbt/internal/Continuous.scala index d9f9e92c4..080925606 100644 --- a/main/src/main/scala/sbt/internal/Continuous.scala +++ b/main/src/main/scala/sbt/internal/Continuous.scala @@ -920,7 +920,7 @@ private[sbt] object Continuous extends DeprecatedContinuous { )(implicit e: Extracted): TriggerMessage = { lazy val default = key.get(watchTriggeredMessage).getOrElse(Watch.defaultOnTriggerMessage) - key.get(deprecatedWatchingMessage).map(Left(_)).getOrElse(Right(default)) + key.get(deprecatedTriggeredMessage).map(Left(_)).getOrElse(Right(default)) } private implicit class ScopeOps(val scope: Scope) {