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

Use Type to compare types instead of TypeRepr

This commit is contained in:
Eugene Yokota 2022-09-21 00:27:06 -04:00
parent 0ee7d11afe
commit e9490e203b
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,25 +170,24 @@ object TaskMacro:
): Expr[Setting[A1]] =
import qctx.reflect.*
// To allow Initialize[Task[A]] in the position of += RHS, we're going to call "taskValue" automatically.
if TypeRepr.of[A2] <:< TypeRepr.of[Def.Initialize[Task[_]]] then
Type.of[A2] match
case '[Def.Initialize[Task[a]]] =>
Expr.summon[Append.Value[A1, Task[a]]] match
case Some(ev) =>
val v2 = v.asExprOf[Def.Initialize[Task[a]]]
'{
$rec.+=($v2.taskValue)(using $ev)
}
case _ =>
report.errorAndAbort(s"Append.Value[${Type.of[A1]}, ${Type.of[Task[a]]}] missing")
else
Expr.summon[Append.Value[A1, A2]] match
case Some(ev) =>
val init = SettingMacro.settingMacroImpl[A2](v)
'{
$rec.append1[A2]($init)(using $ev)
}
case _ => report.errorAndAbort(s"Append.Value[${Type.of[A1]}, ${Type.of[A2]}] missing")
Type.of[A2] match
case '[Def.Initialize[Task[a]]] =>
Expr.summon[Append.Value[A1, Task[a]]] match
case Some(ev) =>
val v2 = v.asExprOf[Def.Initialize[Task[a]]]
'{
$rec.+=($v2.taskValue)(using $ev)
}
case _ =>
report.errorAndAbort(s"Append.Value[${Type.of[A1]}, ${Type.of[Task[a]]}] missing")
case _ =>
Expr.summon[Append.Value[A1, A2]] match
case Some(ev) =>
val init = SettingMacro.settingMacroImpl[A2](v)
'{
$rec.append1[A2]($init)(using $ev)
}
case _ => report.errorAndAbort(s"Append.Value[${Type.of[A1]}, ${Type.of[A2]}] missing")
/*
private[this] def transformMacroImpl[A](using qctx: Quotes)(init: Expr[A])(

4
main/src/main/scala/sbt/Defaults.scala
View File

@ -635,9 +635,9 @@ object Defaults extends BuildCommon {
},
unmanagedResources := (unmanagedResources / inputFileStamps).value.map(_._1.toFile),
resourceGenerators :== Nil,
resourceGenerators += Def.task {
resourceGenerators += (Def.task {
PluginDiscovery.writeDescriptors(discoveredSbtPlugins.value, resourceManaged.value)
},
}).taskValue,
managedResources := generate(resourceGenerators).value,
resources := Classpaths.concat(managedResources, unmanagedResources).value
)