[#1526] Fix use of compinit clobbering existing completions

src/main/java/picocli/AutoComplete.java

@@ -359,7 +359,10 @@ private static class CommandDescriptor {
             "  alias compopt=complete\n" +
             "\n" +
             "  # Enable bash completion in zsh (see [7])\n" +
-            "  autoload -U +X compinit && compinit\n" +
+            "  # Only initialize completions module once to avoid unregistering existing completions.\n" +
+            "  if ! type compdef > /dev/null; then\n" +
+            "    autoload -U +X compinit && compinit\n" +
+            "  fi\n" +
             "  autoload -U +X bashcompinit && bashcompinit\n" +
             "fi\n" +
             "\n" +

src/test/java/picocli/AutoCompleteTest.java

@@ -687,7 +687,10 @@ private String expectedCompletionScriptForAutoCompleteApp() {
                 "  alias compopt=complete\n" +
                 "\n" +
                 "  # Enable bash completion in zsh (see [7])\n" +
-                "  autoload -U +X compinit && compinit\n" +
+                "  # Only initialize completions module once to avoid unregistering existing completions.\n" +
+                "  if ! type compdef > /dev/null; then\n" +
+                "    autoload -U +X compinit && compinit\n" +
+                "  fi\n" +
                 "  autoload -U +X bashcompinit && bashcompinit\n" +
                 "fi\n" +
                 "\n" +
@@ -898,7 +901,10 @@ private String expectedCompletionScriptForNonDefault() {
                 "  alias compopt=complete\n" +
                 "\n" +
                 "  # Enable bash completion in zsh (see [7])\n" +
-                "  autoload -U +X compinit && compinit\n" +
+                "  # Only initialize completions module once to avoid unregistering existing completions.\n" +
+                "  if ! type compdef > /dev/null; then\n" +
+                "    autoload -U +X compinit && compinit\n" +
+                "  fi\n" +
                 "  autoload -U +X bashcompinit && bashcompinit\n" +
                 "fi\n" +
                 "\n" +
@@ -1457,7 +1463,10 @@ private String getCompletionScriptText(String cmdName) {
                     "  alias compopt=complete\n" +
                     "\n" +
                     "  # Enable bash completion in zsh (see [7])\n" +
-                    "  autoload -U +X compinit && compinit\n" +
+                    "  # Only initialize completions module once to avoid unregistering existing completions.\n" +
+                    "  if ! type compdef > /dev/null; then\n" +
+                    "    autoload -U +X compinit && compinit\n" +
+                    "  fi\n" +
                     "  autoload -U +X bashcompinit && bashcompinit\n" +
                     "fi\n" +
                     "\n" +
@@ -1660,7 +1669,10 @@ private String getCompletionScriptTextWithHidden(String commandName) {
                 "  alias compopt=complete\n" +
                 "\n" +
                 "  # Enable bash completion in zsh (see [7])\n" +
-                "  autoload -U +X compinit && compinit\n" +
+                "  # Only initialize completions module once to avoid unregistering existing completions.\n" +
+                "  if ! type compdef > /dev/null; then\n" +
+                "    autoload -U +X compinit && compinit\n" +
+                "  fi\n" +
                 "  autoload -U +X bashcompinit && bashcompinit\n" +
                 "fi\n" +
                 "\n" +

src/test/resources/bashify_completion.bash

@@ -51,7 +51,10 @@ elif [ -n "$ZSH_VERSION" ]; then
   alias compopt=complete
 
   # Enable bash completion in zsh (see [7])
-  autoload -U +X compinit && compinit
+  # Only initialize completions module once to avoid unregistering existing completions.
+  if ! type compdef > /dev/null; then
+    autoload -U +X compinit && compinit
+  fi
   autoload -U +X bashcompinit && bashcompinit
 fi
 

src/test/resources/basic.bash

@@ -51,7 +51,10 @@ elif [ -n "$ZSH_VERSION" ]; then
   alias compopt=complete
 
   # Enable bash completion in zsh (see [7])
-  autoload -U +X compinit && compinit
+  # Only initialize completions module once to avoid unregistering existing completions.
+  if ! type compdef > /dev/null; then
+    autoload -U +X compinit && compinit
+  fi
   autoload -U +X bashcompinit && bashcompinit
 fi
 

src/test/resources/hyphenated_completion.bash

@@ -51,7 +51,10 @@ elif [ -n "$ZSH_VERSION" ]; then
   alias compopt=complete
 
   # Enable bash completion in zsh (see [7])
-  autoload -U +X compinit && compinit
+  # Only initialize completions module once to avoid unregistering existing completions.
+  if ! type compdef > /dev/null; then
+    autoload -U +X compinit && compinit
+  fi
   autoload -U +X bashcompinit && bashcompinit
 fi
 

src/test/resources/picocompletion-demo-help_completion.bash

@@ -51,7 +51,10 @@ elif [ -n "$ZSH_VERSION" ]; then
   alias compopt=complete
 
   # Enable bash completion in zsh (see [7])
-  autoload -U +X compinit && compinit
+  # Only initialize completions module once to avoid unregistering existing completions.
+  if ! type compdef > /dev/null; then
+    autoload -U +X compinit && compinit
+  fi
   autoload -U +X bashcompinit && bashcompinit
 fi
 

src/test/resources/picocompletion-demo_completion.bash

@@ -51,7 +51,10 @@ elif [ -n "$ZSH_VERSION" ]; then
   alias compopt=complete
 
   # Enable bash completion in zsh (see [7])
-  autoload -U +X compinit && compinit
+  # Only initialize completions module once to avoid unregistering existing completions.
+  if ! type compdef > /dev/null; then
+    autoload -U +X compinit && compinit
+  fi
   autoload -U +X bashcompinit && bashcompinit
 fi