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

Allow calling TaskKey.previous in input tasks 

I discovered that it wasn't possible to call .previous in an input task.
While I understand why you can't call .previous on an InputKey, I think
it makes sense to allow calling .previous on a TaskKey within an input
task.
This commit is contained in:
Ethan Atkins 2019-04-25 15:56:08 -07:00
parent 3269eae533
commit 81ce14d58c
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main-settings/src/main/scala/sbt/std/TaskMacro.scala
View File

@ -450,6 +450,7 @@ object TaskMacro {
def expand(nme: String, tpe: Type, tree: Tree): Converted[c.type] = nme match { def expand(nme: String, tpe: Type, tree: Tree): Converted[c.type] = nme match {
case WrapInitTaskName => Converted.Success(wrapInitTask(tree)(c.WeakTypeTag(tpe))) case WrapInitTaskName => Converted.Success(wrapInitTask(tree)(c.WeakTypeTag(tpe)))
case WrapPreviousName => Converted.Success(wrapInitTask(tree)(c.WeakTypeTag(tpe)))
case ParserInput.WrapInitName => Converted.Success(wrapInitParser(tree)(c.WeakTypeTag(tpe))) case ParserInput.WrapInitName => Converted.Success(wrapInitParser(tree)(c.WeakTypeTag(tpe)))
case WrapInitInputName => Converted.Success(wrapInitInput(tree)(c.WeakTypeTag(tpe))) case WrapInitInputName => Converted.Success(wrapInitInput(tree)(c.WeakTypeTag(tpe)))
case WrapInputName => Converted.Success(wrapInput(tree)(c.WeakTypeTag(tpe))) case WrapInputName => Converted.Success(wrapInput(tree)(c.WeakTypeTag(tpe)))

10
sbt/src/sbt-test/actions/previous-in-input-task/build.sbt Normal file
View File

@ -0,0 +1,10 @@
import sjsonnew.BasicJsonProtocol._
val cacheTask = taskKey[Int]("task")
cacheTask := 1
val checkTask = inputKey[Unit]("validate that the correct value is set by cacheTask")
checkTask := {
val expected = Def.spaceDelimited("").parsed.head.toInt
assert(cacheTask.previous.getOrElse(0) == expected)
}

5
sbt/src/sbt-test/actions/previous-in-input-task/test Normal file
View File

@ -0,0 +1,5 @@
> checkTask 0
> cacheTask
> checkTask 1