show correct auto complete value for nargs option in combination with flag option (#2816)

Author: Rowlando13

CHANGES.rst

@@ -1,5 +1,12 @@
 .. currentmodule:: click
 
+Version 8.2.x
+-------------
+
+Unreleased
+
+-   show correct auto complete value for nargs option in combination with flag option :issue:`2813`
+
 Version 8.2.2
 -------------
 

src/click/shell_completion.py

@@ -552,6 +552,7 @@ def _is_incomplete_option(ctx: Context, args: list[str], param: Parameter) -> bo
 
         if _start_of_option(ctx, arg):
             last_option = arg
+            break
 
     return last_option is not None and last_option in param.opts
 

tests/test_shell_completion.py

@@ -220,6 +220,19 @@ def test_option_flag():
     assert _get_words(cli, ["--on"], "a") == ["a1", "a2"]
 
 
+def test_flag_option_with_nargs_option():
+    cli = Command(
+        "cli",
+        add_help_option=False,
+        params=[
+            Argument(["a"], type=Choice(["a1", "a2", "b"])),
+            Option(["--flag"], is_flag=True),
+            Option(["-c"], type=Choice(["p", "q"]), nargs=2),
+        ],
+    )
+    assert _get_words(cli, ["a1", "--flag", "-c"], "") == ["p", "q"]
+
+
 def test_option_custom():
     def custom(ctx, param, incomplete):
         return [incomplete.upper()]