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

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 14d2bdafd8
commit 44c3e27eb7
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala
View File

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