From 116d2ae81536ce702c837ca0207b137729090539 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Tue, 25 Dec 2018 20:24:49 -0800 Subject: [PATCH] Use ? instead of extracting state I was unaware of the '?' method when I wrote this. --- main/src/main/scala/sbt/Defaults.scala | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index fc9a13321..3da229644 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -619,13 +619,10 @@ object Defaults extends BuildCommon { watchOnTermination := Watched.onTermination, watchConfig := { val sources = watchTransitiveSources.value ++ watchProjectTransitiveSources.value - val extracted = Project.extract(state.value) - val wm = extracted - .getOpt(watchingMessage) + val wm = watchingMessage.?.value .map(w => (count: Int) => Some(w(WatchState.empty(sources).withCount(count)))) .getOrElse(watchStartMessage.value) - val tm = extracted - .getOpt(triggeredMessage) + val tm = triggeredMessage.?.value .map( tm => (_: TypedPath, count: Int) => Some(tm(WatchState.empty(sources).withCount(count))) )