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

ensure a derived setting is only injected into a scope once

This commit is contained in:
Mark Harrah 2013-05-08 12:56:58 -04:00
parent 94f4d4e8c0
commit 962a163f33
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/collection/src/main/scala/sbt/Settings.scala
View File

@ -96,12 +96,15 @@ trait Init[Scope]
{
import collection.mutable
val (derived, defs) = init.partition(_.isDerived)
val derivs = new mutable.HashMap[AttributeKey[_], mutable.ListBuffer[Setting[_]]]
final class Derived[T](val setting: Setting[T]) { val inScopes = new mutable.HashSet[Scope] }
val derivs = new mutable.HashMap[AttributeKey[_], mutable.ListBuffer[Derived[_]]]
for(s <- derived; d <- s.dependencies)
derivs.getOrElseUpdate(d.key, new mutable.ListBuffer) += s
derivs.getOrElseUpdate(d.key, new mutable.ListBuffer) += new Derived(s)
val deriveFor = (sk: ScopedKey[_]) =>
derivs.get(sk.key).toList.flatMap(_.toList).map(_.setScope(sk.scope))
val deriveFor = (sk: ScopedKey[_]) => {
val derivedForKey: List[Derived[_]] = derivs.get(sk.key).toList.flatten
derivedForKey.filter(_.inScopes add sk.scope).map(_.setting setScope sk.scope)
}
val processed = new mutable.HashSet[ScopedKey[_]]
val out = new mutable.ListBuffer[Setting[_]]
@ -119,6 +122,7 @@ trait Init[Scope]
def compiled(init: Seq[Setting[_]], actual: Boolean = true)(implicit delegates: Scope => Seq[Scope], scopeLocal: ScopeLocal, display: Show[ScopedKey[_]]): CompiledMap =
{
// inject derived settings into scopes where their dependencies are directly defined
val derived = derive(init)
// prepend per-scope settings
val withLocal = addLocal(derived)(scopeLocal)