buildstream/_frontend/cli.py

@@ -161,7 +161,7 @@ def override_main(self, args=None, prog_name=None, complete_var=None,
     # Hook for the Bash completion.  This only activates if the Bash
     # completion is actually enabled, otherwise this is quite a fast
     # noop.
-    if main_bashcomplete(self, prog_name, override_completions):
+    if main_bashcomplete(self, prog_name, args, override_completions):
 
         # If we're running tests we cant just go calling exit()
         # from the main process.

buildstream/_frontend/complete.py

@@ -313,10 +313,10 @@ def get_choices(cli, prog_name, args, incomplete, override):
             yield item
 
 
-def do_complete(cli, prog_name, override):
+def do_complete(cli, prog_name, args, override):
     cwords = split_arg_string(os.environ['COMP_WORDS'])
     cword = int(os.environ['COMP_CWORD'])
-    args = cwords[1:cword]
+    args = args + cwords[1:cword]
     try:
         incomplete = cwords[cword]
     except IndexError:
@@ -328,11 +328,11 @@ def do_complete(cli, prog_name, override):
 
 # Main function called from main.py at startup here
 #
-def main_bashcomplete(cmd, prog_name, override):
+def main_bashcomplete(cmd, prog_name, args, override):
     """Internal handler for the bash completion support."""
 
     if '_BST_COMPLETION' in os.environ:
-        do_complete(cmd, prog_name, override)
+        do_complete(cmd, prog_name, args, override)
         return True
 
     return False

tests/completions/completions.py

@@ -281,3 +281,44 @@ def test_argument_element_invalid(datafiles, cli, project, cmd, word_idx, expect
 ])
 def test_help_commands(cli, cmd, word_idx, expected):
     assert_completion(cli, cmd, word_idx, expected)
+
+
+@pytest.mark.datafiles(os.path.join(DATA_DIR, 'project'))
+def test_argument_artifact(cli, tmpdir, datafiles):
+    project = os.path.join(datafiles.dirname, datafiles.basename)
+
+    # Build an import element with no dependencies (as there will only be ONE cache key)
+    result = cli.run(project=project, args=['build', 'import-bin.bst'])  # Has no dependencies
+    result.assert_success()
+
+    # Get the key and the artifact ref ($project/$element_name/$key)
+    key = cli.get_element_key(project, 'import-bin.bst')
+    artifact = os.path.join('test', 'import-bin', key)
+
+    # Test autocompletion of the artifact
+    cmds = [
+        'bst artifact log ',
+        'bst artifact log t',
+        'bst artifact log test/'
+    ]
+
+    for i, cmd in enumerate(cmds):
+        word_idx = 3
+        result = cli.run(project=project, cwd=project, env={
+            '_BST_COMPLETION': 'complete',
+            'COMP_WORDS': cmd,
+            'COMP_CWORD': str(word_idx)
+        })
+        words = []
+        if result.output:
+            words = result.output.splitlines()  # This leaves an extra space on each e.g. 'foo.bst ']
+            words = [word.strip() for word in words]
+
+            if i == 0:
+                expected = PROJECT_ELEMENTS + [artifact]  # We should now be able to see the artifact
+            elif i == 1:
+                expected = ['target.bst', artifact]
+            elif i == 2:
+                expected = [artifact]
+
+            assert expected == words