Bugfix/shellcompletion/commandnames

src/click/core.py

@@ -129,11 +129,11 @@ def sort_key(item):
 
 
 def _get_visible_commands(ctx, incomplete):
-    for c in ctx.command.list_commands(ctx):
-        if c.startswith(incomplete):
-            command = ctx.command.get_command(ctx, c)
+    for name in ctx.command.list_commands(ctx):
+        if name.startswith(incomplete):
+            command = ctx.command.get_command(ctx, name)
             if not command.hidden:
-                yield command
+                yield name, command
 
 
 class ParameterSource:
@@ -765,14 +765,14 @@ def shell_complete(self, ctx, all_args, incomplete):
             ctx = ctx.parent
             if isinstance(ctx.command, MultiCommand) and ctx.command.chain:
                 remaining_commands = [
-                    c
-                    for c in _get_visible_commands(ctx, incomplete)
-                    if c.name not in ctx.protected_args
+                    (name, command)
+                    for name, command in _get_visible_commands(ctx, incomplete)
+                    if name not in ctx.protected_args
                 ]
                 results.extend(
                     [
-                        ("plain", c.name, c.get_short_help_str())
-                        for c in remaining_commands
+                        ("plain", name, command.get_short_help_str())
+                        for name, command in remaining_commands
                     ]
                 )
         return results
@@ -1420,8 +1420,8 @@ def shell_complete(self, ctx, all_args, incomplete):
         results = []
         results.extend(
             [
-                ("plain", c.name, c.get_short_help_str())
-                for c in _get_visible_commands(ctx, incomplete)
+                ("plain", name, command.get_short_help_str())
+                for name, command in _get_visible_commands(ctx, incomplete)
             ]
         )
         results.extend(BaseCommand.shell_complete(self, ctx, all_args, incomplete))

tests/test_shellcomplete.py

@@ -644,3 +644,38 @@ def cli(opt, args):
         pass
 
     assert get_completions(cli, args, part) == expect
+
+
+def test_command_names():
+    @click.group()
+    def cli():
+        pass
+
+    @cli.command()  # use autodetected name
+    def asub():
+        pass
+
+    cli.add_command(asub, name="bsub")  # use manual name override
+
+    @click.command()  # autodetect name
+    def csub():
+        pass
+
+    cli.add_command(csub)  # use autodetected name
+    cli.add_command(csub, name="dsub")  # use manual name override
+
+    @cli.command(name="esub")  # manual name
+    def zsub():
+        pass
+
+    cli.add_command(zsub)  # use manual name
+    cli.add_command(zsub, name="fsub")  # use manual name override
+
+    assert get_completions(cli, [""], "") == [
+        "asub",
+        "bsub",
+        "csub",
+        "dsub",
+        "esub",
+        "fsub",
+    ]