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

Don't use deprecated `in` inside of macros 

The inputFileChanges, inputFiles and outputFiles macros all used the now
deprecated `in` syntax, which causes warnings for builds that use these
apis. SlashSyntax doesn't naively work in these macros so it was easier
to just reimplement the logic in this file.

Fixes #6330
This commit is contained in:
Ethan Atkins 2021-03-08 10:54:00 -08:00
parent 571005efa0
commit 7dc5590190
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main/src/main/scala/sbt/internal/FileChangesMacro.scala
View File

@ -58,6 +58,10 @@ object FileChangesMacro {
c.universe.reify(outputFileStamps) c.universe.reify(outputFileStamps)
) )
} }
def rescope[T](left: TaskKey[_], right: TaskKey[T]): TaskKey[T] =
Scoped.scopedTask(left.scope.copy(task = Select(left.key)), right.key)
def rescope[T](left: Scope, right: TaskKey[T]): TaskKey[T] =
Scoped.scopedTask(left, right.key)
private def impl[T: c.WeakTypeTag]( private def impl[T: c.WeakTypeTag](
c: blackbox.Context c: blackbox.Context
)( )(
@ -68,20 +72,20 @@ object FileChangesMacro {
import c.universe._ import c.universe._
val taskScope = getTaskScope(c) val taskScope = getTaskScope(c)
reify { reify {
val changes = (changeKey.splice in taskScope.splice).value val changes = rescope(taskScope.splice, changeKey.splice).value
val current = (currentKey.splice in taskScope.splice).value val current = rescope(taskScope.splice, currentKey.splice).value
import sbt.nio.FileStamp.Formats._ import sbt.nio.FileStamp.Formats._
val previous = Previous.runtimeInEnclosingTask(mapKey.splice in taskScope.splice).value val previous = Previous.runtimeInEnclosingTask(rescope(taskScope.splice, mapKey.splice)).value
previous.map(changes).getOrElse(FileChanges.noPrevious(current)) previous.map(changes).getOrElse(FileChanges.noPrevious(current))
} }
} }
def inputFilesImpl[T: c.WeakTypeTag](c: blackbox.Context): c.Expr[Seq[NioPath]] = { def inputFilesImpl[T: c.WeakTypeTag](c: blackbox.Context): c.Expr[Seq[NioPath]] = {
val taskKey = getTaskScope(c) val taskKey = getTaskScope(c)
c.universe.reify((allInputFiles in taskKey.splice).value) c.universe.reify(rescope(taskKey.splice, allInputFiles).value)
} }
def outputFilesImpl[T: c.WeakTypeTag](c: blackbox.Context): c.Expr[Seq[NioPath]] = { def outputFilesImpl[T: c.WeakTypeTag](c: blackbox.Context): c.Expr[Seq[NioPath]] = {
val taskKey = getTaskScope(c) val taskKey = getTaskScope(c)
c.universe.reify((allOutputFiles in taskKey.splice).value) c.universe.reify(rescope(taskKey.splice, allOutputFiles).value)
} }
private def getTaskScope[T: c.WeakTypeTag](c: blackbox.Context): c.Expr[sbt.Scope] = { private def getTaskScope[T: c.WeakTypeTag](c: blackbox.Context): c.Expr[sbt.Scope] = {
import c.universe._ import c.universe._
@ -92,7 +96,7 @@ object FileChangesMacro {
val expr = c.Expr[TaskKey[T]](k) val expr = c.Expr[TaskKey[T]](k)
c.universe.reify { c.universe.reify {
if (expr.splice.scope.task.toOption.isDefined) expr.splice.scope if (expr.splice.scope.task.toOption.isDefined) expr.splice.scope
else expr.splice.scope in expr.splice.key else expr.splice.scope.copy(task = sbt.Select(expr.splice.key))
} }
case _ => c.abort(c.enclosingPosition, err) case _ => c.abort(c.enclosingPosition, err)
} }