Merge pull request #200 from ThomasWaldmann/doubled-rest-fix

zsh: prevent duplicate default REMAINDER spec in generated completions

Author: casperdcl

shtab/__init__.py

@@ -606,10 +606,17 @@ def command_case(prefix, options):
 
         return f"""\
 {prefix}() {{
-  local context state line curcontext="$curcontext" one_or_more='(*)' remainder='(-)*'
-
-  if ((${{{prefix}_options[(I)${{(q)one_or_more}}*]}} + ${{{prefix}_options[(I)${{(q)remainder}}*]}} == 0)); then  # noqa: E501
-    {prefix}_options+=(': :{prefix}_commands' '*::: :->{name}')
+  local context state line \
+curcontext="$curcontext" one_or_more='(*)' remainder='(-)*' default='*::: :->{name}'
+
+  # Add default positional/remainder specs only if none exist, and only once per session
+  if (( ! {prefix}_defaults_added )); then
+    if (( ${{{prefix}_options[(I)${{(q)one_or_more}}*]}} +\
+          ${{{prefix}_options[(I)${{(q)remainder}}*]}} +\
+          ${{{prefix}_options[(I)${{(q)default}}]}} == 0 )); then
+      {prefix}_options+=(': :{prefix}_commands' '*::: :->{name}')
+    fi
+    {prefix}_defaults_added=1
   fi
   _arguments -C -s ${prefix}_options
 
@@ -631,6 +638,9 @@ def command_option(prefix, options):
 {prefix}_options=(
   {arguments}
 )
+
+# guard to ensure default positional specs are added only once per session
+{prefix}_defaults_added=0
 """
 
     def command_list(prefix, options):

tests/test_shtab.py

@@ -133,6 +133,8 @@ def test_prog_scripts(shell, caplog, capsys):
     elif shell == "zsh":
         assert script_py == [
             "#compdef script.py", "_describe 'script.py commands' _commands",
+            'local context state line curcontext="$curcontext" '
+            "one_or_more='(*)' remainder='(-)*' default='*::: :->script.py'",
             "_shtab_shtab_options+=(': :_shtab_shtab_commands' '*::: :->script.py')", "script.py)",
             "compdef _shtab_shtab -N script.py"]
     elif shell == "tcsh":