From 9f21bb451d2b67a1b9647d555e25d5da50ed03a1 Mon Sep 17 00:00:00 2001
From: eugene yokota <eed3si9n@gmail.com>
Date: Mon, 29 Aug 2016 15:11:32 -0400
Subject: [PATCH] [sbt 1.0] Remove .value extension method from input tasks
 (#2710)

* Remove .value from input tasks. Ref #2709

Calling `.value` method on an input task returns `InputTask[A]`, which
is completely unintuitive and often results to a bug.

In most cases `.evaluated` should be called, which returns `A` by
evaluating the task. Just in case `InputTask[A]` is needed,
`toInputTask` method is now provided.

* Fixed test

* Rename toInputTask to inputTaskValue
---
 .../src/main/scala/sbt/std/InputWrapper.scala | 13 ++++++++++-
 main-settings/src/test/scala/UsageTest.scala  |  2 +-
 .../sbt-test/actions/input-task/Hello.scala   |  3 +++
 sbt/src/sbt-test/actions/input-task/build.sbt | 22 +++++++++++++++++++
 sbt/src/sbt-test/actions/input-task/test      |  1 +
 5 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 sbt/src/sbt-test/actions/input-task/Hello.scala
 create mode 100644 sbt/src/sbt-test/actions/input-task/build.sbt
 create mode 100644 sbt/src/sbt-test/actions/input-task/test

diff --git a/main-settings/src/main/scala/sbt/std/InputWrapper.scala b/main-settings/src/main/scala/sbt/std/InputWrapper.scala
index ce203f38b..2e54ecbc6 100644
--- a/main-settings/src/main/scala/sbt/std/InputWrapper.scala
+++ b/main-settings/src/main/scala/sbt/std/InputWrapper.scala
@@ -90,14 +90,23 @@ object InputWrapper {
   def valueMacroImpl[T: c.WeakTypeTag](c: Context): c.Expr[T] =
     ContextUtil.selectMacroImpl[T](c) { (ts, pos) =>
       ts.tree.tpe match {
+        case tpe if tpe <:< c.weakTypeOf[Initialize[T]] =>
+          if (c.weakTypeOf[T] <:< c.weakTypeOf[InputTask[_]]) {
+            c.abort(pos, """`value` is removed from input tasks. Use `evaluated` or `inputTaskValue`.
+                           |See http://www.scala-sbt.org/1.0/docs/Input-Tasks.html for more details.""".stripMargin)
+          }
+          InputWrapper.wrapInit[T](c)(ts, pos)
         case tpe if tpe <:< c.weakTypeOf[Initialize[Task[T]]]      => InputWrapper.wrapInitTask[T](c)(ts, pos)
-        case tpe if tpe <:< c.weakTypeOf[Initialize[T]]            => InputWrapper.wrapInit[T](c)(ts, pos)
         case tpe if tpe <:< c.weakTypeOf[Task[T]]                  => InputWrapper.wrapTask[T](c)(ts, pos)
         case tpe if tpe <:< c.weakTypeOf[InputTask[T]]             => InputWrapper.wrapInputTask[T](c)(ts, pos)
         case tpe if tpe <:< c.weakTypeOf[Initialize[InputTask[T]]] => InputWrapper.wrapInitInputTask[T](c)(ts, pos)
         case tpe                                                   => unexpectedType(c)(pos, tpe)
       }
     }
+  def inputTaskValueMacroImpl[T: c.WeakTypeTag](c: Context): c.Expr[InputTask[T]] =
+    ContextUtil.selectMacroImpl[InputTask[T]](c) { (ts, pos) =>
+      InputWrapper.wrapInit[InputTask[T]](c)(ts, pos)
+    }
   def taskValueMacroImpl[T: c.WeakTypeTag](c: Context): c.Expr[Task[T]] =
     ContextUtil.selectMacroImpl[Task[T]](c) { (ts, pos) =>
       val tpe = ts.tree.tpe
@@ -141,6 +150,8 @@ sealed abstract class ParserInput[T] {
 sealed abstract class InputEvaluated[T] {
   @compileTimeOnly("`evaluated` can only be used within an input task macro, such as := or Def.inputTask.")
   def evaluated: T = macro InputWrapper.valueMacroImpl[T]
+  @compileTimeOnly("`inputTaskValue` can only be used within an input task macro, such as := or Def.inputTask.")
+  def inputTaskValue: InputTask[T] = macro InputWrapper.inputTaskValueMacroImpl[T]
 }
 sealed abstract class ParserInputTask[T] {
   @compileTimeOnly("`parsed` can only be used within an input task macro, such as := or Def.inputTask.")
diff --git a/main-settings/src/test/scala/UsageTest.scala b/main-settings/src/test/scala/UsageTest.scala
index 88c894e2a..c150dd52c 100644
--- a/main-settings/src/test/scala/UsageTest.scala
+++ b/main-settings/src/test/scala/UsageTest.scala
@@ -72,7 +72,7 @@ object Assign {
   }
 
   val it3: Initialize[InputTask[String]] = Def.inputTask[String] {
-    tsk.parsed.value + itsk.parsed.value.toString + isk.value
+    tsk.parsed.value + itsk.parsed.value.toString + isk.evaluated
   }
   // should not compile: cannot use a task to define the parser
   /*	val it4 = Def.inputTask {
diff --git a/sbt/src/sbt-test/actions/input-task/Hello.scala b/sbt/src/sbt-test/actions/input-task/Hello.scala
new file mode 100644
index 000000000..fa6870dce
--- /dev/null
+++ b/sbt/src/sbt-test/actions/input-task/Hello.scala
@@ -0,0 +1,3 @@
+object Hello extends App {
+  println("hello" + args.toList.toString)
+}
diff --git a/sbt/src/sbt-test/actions/input-task/build.sbt b/sbt/src/sbt-test/actions/input-task/build.sbt
new file mode 100644
index 000000000..ecc533f9b
--- /dev/null
+++ b/sbt/src/sbt-test/actions/input-task/build.sbt
@@ -0,0 +1,22 @@
+import complete.Parser
+
+// http://www.scala-sbt.org/0.13/docs/Input-Tasks.html
+
+val run2 = inputKey[Unit](
+    "Runs the main class twice with different argument lists separated by --")
+val check = taskKey[Unit]("")
+
+val separator: Parser[String] = "--"
+
+lazy val root = (project in file(".")).
+  settings(
+    name := "run-test",
+    run2 := {
+       val one = (run in Compile).evaluated
+       val sep = separator.parsed
+       val two = (run in Compile).evaluated
+    },
+    check := {
+      val x = run2.toTask(" a b -- c d").value
+    }
+  )
diff --git a/sbt/src/sbt-test/actions/input-task/test b/sbt/src/sbt-test/actions/input-task/test
new file mode 100644
index 000000000..15675b169
--- /dev/null
+++ b/sbt/src/sbt-test/actions/input-task/test
@@ -0,0 +1 @@
+> check