luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Ethan Atkins 2019-05-29 19:48:01 -07:00
parent bbe0e62a0f
commit 90d0c54caa
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/src/main/scala/sbt/Defaults.scala
View File

@ -154,6 +154,7 @@ object Defaults extends BuildCommon {
inputFileStamper :== sbt.nio.FileStamper.Hash, inputFileStamper :== sbt.nio.FileStamper.Hash,
outputFileStamper :== sbt.nio.FileStamper.LastModified, outputFileStamper :== sbt.nio.FileStamper.LastModified,
onChangedBuildSource :== sbt.nio.Keys.WarnOnSourceChanges, onChangedBuildSource :== sbt.nio.Keys.WarnOnSourceChanges,
watchTriggeredMessage :== sbt.nio.Watch.defaultOnTriggerMessage,
watchForceTriggerOnAnyChange :== false, watchForceTriggerOnAnyChange :== false,
watchPersistFileStamps :== true, watchPersistFileStamps :== true,
watchTriggers :== Nil, watchTriggers :== Nil,

2
main/src/main/scala/sbt/internal/Continuous.scala
View File

@ -920,7 +920,7 @@ private[sbt] object Continuous extends DeprecatedContinuous {
)(implicit e: Extracted): TriggerMessage = { )(implicit e: Extracted): TriggerMessage = {
lazy val default = lazy val default =
key.get(watchTriggeredMessage).getOrElse(Watch.defaultOnTriggerMessage) 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) { private implicit class ScopeOps(val scope: Scope) {