Merge pull request #3020 from carapace-sh/zsh-declare

zsh: use declare

Author: rsteube

cmd/carapace/cmd/lazyinit/zsh.go

@@ -17,12 +17,18 @@ function _carapace_completer {
   local IFS=$'\n'
   local lines
 
+  declare -x CARAPACE_COMPLINE="${words}"
+  declare -x CARAPACE_ZSH_HASH_DIRS="$(hash -d)"
+  declare -x CARAPACE_SHELL=zsh
+  declare -x CARAPACE_SHELL_BUILTINS="$(print -roC1 -- ${(k)builtins})"
+  declare -x CARAPACE_SHELL_FUNCTIONS="$(print -l ${(ok)functions})"
+
   # shellcheck disable=SC2086,SC2154,SC2155
-  lines="$(echo "${compline}''" | CARAPACE_COMPLINE="${words}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" CARAPACE_SHELL=zsh CARAPACE_SHELL_BUILTINS="$(print -roC1 -- ${(k)builtins})" CARAPACE_SHELL_FUNCTIONS="$(print -l ${(ok)functions})" xargs carapace "${command}" zsh 2>/dev/null)"
+  lines="$(echo "${compline}''" | xargs carapace "${command}" zsh 2>/dev/null)"
   if [ $? -eq 1 ]; then
-    lines="$(echo "${compline}'" | CARAPACE_COMPLINE="${words}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" CARAPACE_SHELL=zsh CARAPACE_SHELL_BUILTINS="$(print -roC1 -- ${(k)builtins})" CARAPACE_SHELL_FUNCTIONS="$(print -l ${(ok)functions})" xargs carapace "${command}" zsh 2>/dev/null)"
+    lines="$(echo "${compline}'" | xargs carapace "${command}" zsh 2>/dev/null)"
     if [ $? -eq 1 ]; then
-      lines="$(echo "${compline}\"" | CARAPACE_COMPLINE="${words}" CARAPACE_ZSH_HASH_DIRS="$(hash -d)" CARAPACE_SHELL=zsh CARAPACE_SHELL_BUILTINS="$(print -roC1 -- ${(k)builtins})" CARAPACE_SHELL_FUNCTIONS="$(print -l ${(ok)functions})" xargs carapace "${command}" zsh 2>/dev/null)"
+      lines="$(echo "${compline}\"" | xargs carapace "${command}" zsh 2>/dev/null)"
     fi
   fi