Use already-parsed values of aruments to see whether they should be c…

…ompleted.

click/_bashcomplete.py

@@ -63,8 +63,8 @@ def do_complete(cli, prog_name):
     else:
         for param in ctx.command.params:
             if isinstance(param, Argument):
-                arguments = [k for k in args if k  != ctx.command.name]
-                if len(arguments) <= param.nargs or param.nargs == -1:
+                value = ctx.params[param.name]
+                if (value == None) or (isinstance(value, tuple) and (len(value) < param.nargs or param.nargs == -1)):
                     try:
                         if callable(param.autocompletion):
                             choices.extend(param.autocompletion(ctx=ctx,
@@ -75,6 +75,7 @@ def do_complete(cli, prog_name):
                             choices.extend(param.autocompletion)
                     except AttributeError:
                         pass
+                    break
 
     for item in choices:
         if item.startswith(incomplete):

examples/bashcompletion/bashcompletion.py

@@ -6,9 +6,12 @@ def cli():
     pass
 
 @cli.command()
-@click.argument("name", type=click.STRING, autocompletion=["John", "Simon", "Doe"])
-def cmd1(name):
-    click.echo('Name: %s' % name)
+@click.option('-c', '--count', type=click.INT, default=1)
+@click.argument("first", type=click.STRING, autocompletion=["John", "Bob", "Fred"])
+@click.argument("last", type=click.STRING, autocompletion=["Smith", "Simon", "Doe"])
+def cmd1(count, first, last):
+    for c in range(count):
+        click.echo('Name: %s %s' % (first, last))
 
 def get_env_vars(ctx, incomplete, cwords, cword):
     return os.environ.keys()