From 26bdccd80f4de07b2799eadc7ac64789cd56bcd7 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 29 Nov 2016 05:57:43 -0500 Subject: [PATCH] Revert "Fix key selection for build level keys" This reverts commit 60bcc58852a1c7a9f92a9c274f70adbe6b87cea4. --- main/src/main/scala/sbt/internal/Act.scala | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/main/src/main/scala/sbt/internal/Act.scala b/main/src/main/scala/sbt/internal/Act.scala index 91d272dad..35dc55aca 100644 --- a/main/src/main/scala/sbt/internal/Act.scala +++ b/main/src/main/scala/sbt/internal/Act.scala @@ -78,16 +78,11 @@ object Act { selectFromValid(ss filter isValid(data), default) } def selectFromValid(ss: Seq[ParsedKey], default: Parser[ParsedKey])(implicit show: Show[ScopedKey[_]]): Parser[ParsedKey] = - selectByTask(selectByConfig(ss)) partition isBuildKey match { - case (_, Seq(single)) => success(single) - case (Seq(single), Seq()) => success(single) - case (Seq(), Seq()) => default - case (buildKeys, projectKeys) => failure("Ambiguous keys: " + showAmbiguous(keys(buildKeys ++ projectKeys))) + selectByTask(selectByConfig(ss)) match { + case Seq() => default + case Seq(single) => success(single) + case multi => failure("Ambiguous keys: " + showAmbiguous(keys(multi))) } - 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) def selectByConfig(ss: Seq[ParsedKey]): Seq[ParsedKey] = ss match { @@ -315,4 +310,4 @@ object Act { final object Omitted extends ParsedAxis[Nothing] 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) } -} +} \ No newline at end of file