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

Revert "Fix key selection for build level keys" 

This reverts commit 60bcc58852.
This commit is contained in:
Eugene Yokota 2016-11-29 05:57:43 -05:00
parent da1bdba0f8
commit 3e653f73b3
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
main/src/main/scala/sbt/Act.scala
View File

@ -77,16 +77,11 @@ object Act {
selectFromValid(ss filter isValid(data), default) selectFromValid(ss filter isValid(data), default)
} }
def selectFromValid(ss: Seq[ParsedKey], default: Parser[ParsedKey])(implicit show: Show[ScopedKey[_]]): Parser[ParsedKey] = def selectFromValid(ss: Seq[ParsedKey], default: Parser[ParsedKey])(implicit show: Show[ScopedKey[_]]): Parser[ParsedKey] =
selectByTask(selectByConfig(ss)) partition isBuildKey match { selectByTask(selectByConfig(ss)) match {
case (_, Seq(single)) => success(single) case Seq() => default
case (Seq(single), Seq()) => success(single) case Seq(single) => success(single)
case (Seq(), Seq()) => default case multi => failure("Ambiguous keys: " + showAmbiguous(keys(multi)))
case (buildKeys, projectKeys) => failure("Ambiguous keys: " + showAmbiguous(keys(buildKeys ++ projectKeys)))
} }
private def isBuildKey(parsed: ParsedKey): Boolean = parsed.key.scope.project match {
case Select(_: BuildReference) => true
case _ => false
}
private[this] def keys(ss: Seq[ParsedKey]): Seq[ScopedKey[_]] = ss.map(_.key) private[this] def keys(ss: Seq[ParsedKey]): Seq[ScopedKey[_]] = ss.map(_.key)
def selectByConfig(ss: Seq[ParsedKey]): Seq[ParsedKey] = def selectByConfig(ss: Seq[ParsedKey]): Seq[ParsedKey] =
ss match { ss match {
@ -315,4 +310,4 @@ object Act {
final object Omitted extends ParsedAxis[Nothing] final object Omitted extends ParsedAxis[Nothing]
final class ParsedValue[T](val value: T) extends ParsedAxis[T] final class ParsedValue[T](val value: T) extends ParsedAxis[T]
def value[T](t: Parser[T]): Parser[ParsedAxis[T]] = t map { v => new ParsedValue(v) } def value[T](t: Parser[T]): Parser[ParsedAxis[T]] = t map { v => new ParsedValue(v) }
} }