From 4ea2a99c3b6300bf465d7cdf07dcb336c068b9a2 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 29 Nov 2016 05:59:33 -0500 Subject: [PATCH] Revert "Completion for build-level keys" This reverts commit e35f9bb11ef851590811e1bccfcb082b8a27fecf. --- main/src/main/scala/sbt/internal/Act.scala | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/main/src/main/scala/sbt/internal/Act.scala b/main/src/main/scala/sbt/internal/Act.scala index 35dc55aca..c8e3660c0 100644 --- a/main/src/main/scala/sbt/internal/Act.scala +++ b/main/src/main/scala/sbt/internal/Act.scala @@ -49,22 +49,12 @@ object Act { new ParsedKey(makeScopedKey(proj, conf, task, extra, key), mask) } - val projectKeys = - for { - rawProject <- optProjectRef(index, current) - proj = resolveProject(rawProject, current) - confAmb <- config(index configs proj) - partialMask = ScopeMask(rawProject.isExplicit, confAmb.isExplicit, false, false) - } yield taskKeyExtra(proj, confAmb, partialMask) - - val build = Some(BuildRef(current.build)) - val buildKeys = - for { - confAmb <- config(index configs build) - partialMask = ScopeMask(false, confAmb.isExplicit, false, false) - } yield taskKeyExtra(build, confAmb, partialMask) - - buildKeys combinedWith projectKeys map (_.flatten) + for { + rawProject <- optProjectRef(index, current) + proj = resolveProject(rawProject, current) + confAmb <- config(index configs proj) + partialMask = ScopeMask(rawProject.isExplicit, confAmb.isExplicit, false, false) + } yield taskKeyExtra(proj, confAmb, partialMask) } def makeScopedKey(proj: Option[ResolvedReference], conf: Option[String], task: Option[AttributeKey[_]], extra: ScopeAxis[AttributeMap], key: AttributeKey[_]): ScopedKey[_] = ScopedKey(Scope(toAxis(proj, Global), toAxis(conf map ConfigKey.apply, Global), toAxis(task, Global), extra), key)