Skip to content

Commit aa22c02

Browse files
authored
Merge pull request sbt#6716 from eed3si9n/wip/global-keys
Fixes tab completion of global keys
2 parents 8f1c0f6 + 6c68b84 commit aa22c02

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

main/src/main/scala/sbt/internal/Act.scala

+6-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,12 @@ object Act {
304304
case Some(ProjectRef(uri, _)) => index.keys(Some(BuildRef(uri)), conf, task)
305305
case _ => Set()
306306
}
307-
val keys: Set[String] = index.keys(proj, conf, task) ++ buildKeys
307+
val globalKeys: Set[String] =
308+
proj match {
309+
case Some(_) => index.keys(None, conf, task)
310+
case _ => Set()
311+
}
312+
val keys: Set[String] = index.keys(proj, conf, task) ++ buildKeys ++ globalKeys
308313
keyParser(keys)
309314
}
310315

server-test/src/test/scala/testpkg/ClientTest.scala

+3-1
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,16 @@ object ClientTest extends AbstractServerTest {
118118
"compileIncSetup",
119119
"compileIncremental",
120120
"compileJava",
121+
"compileOrder",
121122
"compileOutputs",
122123
"compileProgress",
123124
"compileScalaBackend",
124125
"compileSplit",
126+
"compilerCache",
125127
"compilers",
126128
)
127129

128-
assert(complete("compi") == expected)
130+
assert(complete("compi").toVector == expected)
129131
}
130132
test("testOnly completions") { _ =>
131133
val testOnlyExpected = Vector(

0 commit comments

Comments
 (0)