Revert "Fix task macro's handling of Symbol owners in <qual>.value"

This reverts commit 3017bfcd07.

This was causing sbt to be unable to compile.  Reverting temporarily until
we have a shot at a full fix.
This commit is contained in:
Josh Suereth 2014-03-07 22:25:29 -05:00
parent f06948a4af
commit a4b288f35b
2 changed files with 10 additions and 21 deletions

View File

@ -15,12 +15,3 @@ demo := {
val (n, s) = parser.parsed
s * n
}
// Tests for correct Symbol owner structure in the lifted qualifiers of
// the `.value` macro within a task macro. (#1150)
val touchIfChanged = taskKey[Unit]("")
touchIfChanged := {
val foo = (sourceDirectory in Compile).apply(base => base).value.get
()
}

View File

@ -226,19 +226,17 @@ final class ContextUtil[C <: Context](val ctx: C)
object appTransformer extends Transformer
{
override def transform(tree: Tree): Tree =
tree match {
case ApplyTree(TypeApply(Select(_, nme), targ :: Nil), qual :: Nil) =>
changeOwner(qual, currentOwner, initialOwner) // Fixes https://github.com/sbt/sbt/issues/1150
subWrapper(nme.decoded, targ.tpe, qual, tree) match {
case Converted.Success(t, finalTx) => finalTx(t)
case Converted.Failure(p,m) => ctx.abort(p, m)
case _: Converted.NotApplicable[_] => super.transform(tree)
}
tree match
{
case ApplyTree(TypeApply(Select(_, nme), targ :: Nil), qual :: Nil) => subWrapper(nme.decoded, targ.tpe, qual, tree) match {
case Converted.Success(t, finalTx) => finalTx(t)
case Converted.Failure(p,m) => ctx.abort(p, m)
case _: Converted.NotApplicable[_] => super.transform(tree)
}
case _ => super.transform(tree)
}
}
appTransformer.atOwner(initialOwner) {
appTransformer.transform(t)
}
appTransformer.transform(t)
}
}
}