Merge pull request #1236 from zsh-users/refactor_gist

Refactor gist and fix cache broken cache implementation

src/_atach

@@ -69,3 +69,10 @@ esac
 
 return $ret
 
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

src/_cask

@@ -41,14 +41,29 @@
 # ------------------------------------------------------------------------------
 
 function _cask() {
-  local ret=1 state
-  _arguments \
+  typeset -A opt_args
+  local context state line ret=1
+  local curcontext="$curcontext"
+
+  _arguments -C \
+    '(--proxy --http-proxy --https-proxy)--proxy[Set emacs proxy for HTTPS and HTTPS]:host:_hosts' \
+    '(--proxy --http-proxy)--http-proxy[Set emacs proxy for HTTP]:host:_hosts' \
+    '(--proxy --https-proxy)--https-proxy[Set emacs proxy for HTTPS]:host:_hosts' \
+    '(--proxy --http-proxy --https-proxy)--proxy[Set emacs proxy for HTTPS and HTTPS]:host:_hosts' \
+    '--no-proxy[Set Emacs no-proxy to HOST]:host:_hosts' \
+    '(- *)--version[Print Cask version and exit]' \
+    '(- *)'{-h,--help}'[Display usage or information for command]::command:->subcommand' \
+    '--debug[Turn on debug output]' \
+    '--path[Run command in this PATH instead of default-directory]:dir:_files -/' \
+    '(--verbose --silent)--verbose[Be verbose and show debug output]' \
+    '(--verbose --silent)--verbose[Be slient and do not show anything]' \
     ':subcommand:->subcommand' \
-    '*:: :->subcmds' && ret=0
+    '*:: :->subcmds' \
+    && ret=0
 
   case $state in
-    subcommand)
-      subcommands=(
+    (subcommand)
+      local -a subcommands=(
         "build:build all Elisp files in the files directive"
         "clean-elc:remove all byte compiled Elisp files in the files directive"
         "exec:execute command with correct 'exec-path' and 'load-path'"
@@ -71,19 +86,32 @@ function _cask() {
         "upgrade:upgrade Cask itself and its dependencies"
         "version:print program version"
       )
-      _describe -t subcommands 'cask subcommands' subcommands && ret=0
-  esac
 
+      _describe -t subcommands 'cask subcommands' subcommands && ret=0
+      ;;
+    (subcmds)
       case "$words[1]" in
-    init)
+        (init)
           _arguments \
-        '(--dev)--dev[Run in dev mode]' && ret=0 ;;
-    exec)
+            '(--dev)--dev[Run in dev mode]' \
+            && ret=0
+          ;;
+        (exec)
           _generic
           ;;
       esac
+      ;;
+  esac
 
   return ret
 }
 
 _cask "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

src/_cmake

@@ -79,12 +79,12 @@ local -a cmake_build_options=(
   '--list-presets[List available presets]'
   '--workflow[Run a workflow preset]'
 
-  '-E[CMake command mode]:command:_cmake_command_help'
+  '-E[CMake command mode]:command:_cmake_commands'
 
   '-L-[List cache variables]::_values "options" "[non-advanced cache variables]" "A[advanced cache variables]" "H[non-advanced cached variables with help]" "AH[advanced cache variables with help]"'
   '--fresh[Configure a fresh build tree, removing any existing cache file]'
 
-  '--build[Build a CMake-generated project binary tree]:project directory:_path_files -/'
+  '--build[Build a CMake-generated project binary tree]::project directory:_path_files -/'
   '--install[Install a CMake-generated project binary tree]:project directory:_path_files -/'
   '--open[Open generated project in the associated application]:project directory:_path_files -/'
 
@@ -149,11 +149,11 @@ _cmake_generator_options() {
 # --------------
 (( $+functions[_cmake_presets] )) ||
 _cmake_presets() {
-  local invoke; invoke=(${(Q)words})
+  local invoke=(${(Q)words})
   invoke[$CURRENT]=()
   # TODO: remove all arguments -* except -S
 
-  local list_presets; list_presets=(${(f)"$(${invoke} --list-presets 2>/dev/null |
+  local list_presets=(${(f)"$(${invoke} --list-presets 2>/dev/null |
     sed -n -e 's,^[[:space:]]*"\([^"]*\)"[[:space:]]*-[[:space:]]*\(.*\),\1:\2,p' \
            -e 's,^[[:space:]]*"\([^"]*\)"[[:space:]]*$,\1,p')"})
 
@@ -165,24 +165,16 @@ _cmake_presets() {
 # --------------
 (( $+functions[_cmake_targets] )) ||
 _cmake_targets() {
-  local -a targets
-  if [ -f $1/Makefile ]
-  then
+  local dir="$1"
+  local -a targets=()
+  if [[ -f "${dir}/Makefile" && $+commands[make] ]]; then
     # `make help` doesn't work for Makefiles in general, but for CMake generated Makefiles it does.
-    i=1
-    for target in $(make -f $1/Makefile help | \grep -e "\.\.\." | sed "s/\.\.\. //" | sed "s/ (the default.*//") ; do
-      targets[$i]=$target
-      (( i = $i + 1 ))
-    done
-  elif [ -f $1/build.ninja ]
-  then
+    targets=(${(f)"$(make -f $dir/Makefile help 2>/dev/null | awk '/^\.\.\./ { print $2 }')"})
+  elif [[ -f "${dir}/build.ninja" && $+commands[ninja] ]]; then
     # `ninja help` doesn't seem to be the list of targets we're interested in
-    i=1
-    for target in $(ninja -C $1 -t targets all 2&>/dev/null | awk -F: '{print $1}') ; do
-      targets[$i]="$target"
-      (( i++ ))
-    done
+    targets=(${(f)"$(ninja -C $dir -t targets all 2>/dev/null | awk -F: '{print $1}' )"})
   fi
+
   _describe 'build targets' targets
 }
 
@@ -195,44 +187,53 @@ _cmake_suggest_installdirs() {
 }
 
 _cmake_on_build() {
-  local build_extras;build_extras=(
+  local build_extras=(
     '--[Native build tool options]'
     '--target[specify build target]'
     '--clean-first[build target clean first]'
     '--config[For multi-configuration tools]'
     '--parallel[maximum number of build processes]'
-    '--use-stderr')
+    '--use-stderr'
+  )
   local -a undescribed_build_extras
-  i=1
+  local i=1
   for be in $build_extras ; do
     undescribed_build_extras[$i]=$(echo $be | sed "s/\[.*//")
     (( i++ ))
   done
-  inbuild=false
-  dashdashposition=-1
+
+  local in_build=false
+  local dash_dash_position=-1
+  local build_at=$CURRENT
   for ((i = (($CURRENT - 1)); i > 1 ; i--)); do
     if [[ $words[$i] == --build ]]; then
-      inbuild=true
-      buildat=$i
+      in_build=true
+      build_at=$i
       (( difference = $CURRENT - $i ))
     elif [[ $words[$i] == -- ]]; then
-      dashdashposition=$i
+      dash_dash_position=$i
     fi
   done
+
   # check if build mode has been left
-  outofbuild=false
-  for ((i = (($CURRENT - 1)); i > (($buildat + 1)); i--)); do
+  local out_of_build=false
+  for ((i = (($CURRENT - 1)); i > (($build_at + 1)); i--)); do
     # don't check the word after --build (should be a directory)
-    if [[ ${undescribed_build_extras[(r)$words[$i]]} == $words[$i] ]] ; then continue ; fi
+    if [[ ${undescribed_build_extras[(r)$words[$i]]} == $words[$i] ]]; then
+      continue
+    fi
+
     if [[ $words[(($i - 1))] == --target ]]; then continue ; fi
     if [[ $words[(($i - 1))] == --config ]]; then continue ; fi
     if [[ $words[(($i - 1))] == --parallel ]] ; then continue ; fi
-    outofbuild=true
+    out_of_build=true
   done
-  if (( $dashdashposition > 0 )) ; then
-    _cmake_generator_options $words[(($buildat + 1))] $dashdashposition && return 0
+
+  if (( $dash_dash_position > 0 )) ; then
+    _cmake_generator_options $words[(($build_at + 1))] $dash_dash_position && return 0
   fi
-  if [[ "$inbuild" == false || "$difference" -eq 1 ]] ; then
+
+  if [[ "$in_build" == false || "$difference" -eq 1 ]] ; then
     # either there is no --build or completing the directory after --build
     _arguments -C -s \
       - build_opts \
@@ -241,14 +242,14 @@ _cmake_on_build() {
       "$cmake_suggest_build[@]" && return 0
   elif [[ $words[(($CURRENT - 1))] == --target ]] ; then
     # after --build <dir> --target, suggest targets
-    _cmake_targets $words[(($buildat + 1))] && return 0
+    _cmake_targets $words[(($build_at + 1))] && return 0
   elif [[ $words[(($CURRENT - 1))] == --config ]] ; then
     # after --build <dir> --config, no idea
     return 0
   elif [[ $words[(($CURRENT - 1))] == --parallel ]] ; then
     # after --build <dir> --parallel
     return 0
-  elif [ "$outofbuild" = true ] ; then
+  elif [ "$out_of_build" = true ] ; then
     # after --build <dir> --<not a --build option>, suggest other cmake_build_options (like -Wno-dev)
     _arguments "$cmake_build_options[@]" && return 0
   else
@@ -258,43 +259,49 @@ _cmake_on_build() {
 }
 
 _cmake_on_install() {
-  local build_extras;build_extras=(
+  local build_extras=(
     '--[Native build tool options]'
     '--prefix[Override the installation prefix, CMAKE_INSTALL_PREFIX]'
     '--config[For multi-configuration generators(e.g. Visual Studio)]'
     '--component[Component-based install]'
     '--strip[Strip before installing.]'
   )
+
   local -a undescribed_build_extras
-  i=1
+  local i=1
   for be in $build_extras ; do
     undescribed_build_extras[$i]=$(echo $be | sed "s/\[.*//")
     (( i++ ))
   done
-  inbuild=false
-  dashdashposition=-1
+
+  local in_build=false
+  local dash_dash_position=-1
+  local build_at=$CURRENT
   for ((i = (($CURRENT - 1)); i > 1 ; i--)); do
     if [[ $words[$i] == --install ]]; then
-      inbuild=true
-      buildat=$i
+      in_build=true
+      build_at=$i
       (( difference = $CURRENT - $i ))
     elif [[ $words[$i] == -- ]]; then
-      dashdashposition=$i
+      dash_dash_position=$i
     fi
   done
-  outofbuild=false
-  for ((i = (($CURRENT - 1)); i > (($buildat + 1)); i--)); do
+
+  local out_of_build=false
+  for ((i = (($CURRENT - 1)); i > (($build_at + 1)); i--)); do
     # don't check the word after --install (should be a directory)
     if [[ ${undescribed_build_extras[(r)$words[$i]]} == $words[$i] ]] ; then continue ; fi
     if [[ $words[(($i - 1))] == --prefix ]]; then continue ; fi
     if [[ $words[(($i - 1))] == --config ]]; then continue ; fi
     if [[ $words[(($i - 1))] == --component ]]; then continue ; fi
-    outofbuild=true
+    out_of_build=true
   done
-  if (( $dashdashposition > 0 )) ; then
-    _cmake_generator_options $words[(($buildat + 1))] $dashdashposition && return 0
+
+  if (( $dash_dash_position > 0 )) ; then
+    _cmake_generator_options $words[(($build_at + 1))] $dash_dash_position && return 0
   fi
-  if [[ "$inbuild" == false || "$difference" -eq 1 ]] ; then
+
+  if [[ "$in_build" == false || "$difference" -eq 1 ]] ; then
     # either there is no --install or completing the directory after --install
     _arguments -C -s \
       - build_opts \
@@ -310,7 +317,7 @@ _cmake_on_install() {
   elif [[ $words[(($CURRENT - 1))] == --component ]] ; then
     # after --build <dir> --component, no idea
     return 0
-  elif [ "$outofbuild" = true ] ; then
+  elif [ "$out_of_build" = true ] ; then
     # after --build <dir> --<not a --build option>, suggest other cmake_build_options (like -Wno-dev)
     _arguments "$cmake_build_options[@]" && return 0
   else
@@ -341,19 +348,16 @@ local -a cmake_help_actions=(
   '(- 1)--help-variable-list[List variables with help available and exit]'
   '(- 1)--help-variables[Print cmake-variables manual and exit]'
 )
-_cmake_help() {
-  _arguments -C -s - help "$cmake_help_actions[@]"
-}
 
 # -----------------
 # _cmake_list_names
 # -----------------
 (( $+functions[_cmake_list_names] )) ||
 _cmake_list_names() {
-  local command; command="$@[1]"
-  local desc; desc="$@[2]"
-  local opts; opts=($@[3])
-  local list_names; list_names=(${(f)"$($service $command 2> /dev/null)"})
+  local command="$@[1]"
+  local desc="$@[2]"
+  local opts=($@[3])
+  local list_names=(${(f)"$($service $command 2> /dev/null)"})
   # Older CMake (< 3.0) writes out the version
   list_names=(${^list_names##cmake version*})
 
@@ -382,7 +386,7 @@ _cmake_define_property() {
 # ----------------------------
 (( $+functions[_cmake_define_property_names] )) ||
 _cmake_define_property_names() {
-  local alternatives; alternatives=(
+  local alternatives=(
     'common-property-names:common property name:_cmake_define_common_property_names -qS='
   )
   local -A cmake_langs
@@ -402,8 +406,9 @@ _cmake_define_property_names() {
 # ---------------------------------
 (( $+functions[_cmake_define_lang_property_names] )) ||
 _cmake_define_lang_property_names() {
-  local cmake_lang="$@[-2]" cmake_lang_desc="$@[-1]"
-  local properties; properties=(
+  local cmake_lang="$@[-2]"
+  local cmake_lang_desc="$@[-1]"
+  local -a properties=(
     "CMAKE_${cmake_lang}_COMPILER:${cmake_lang_desc} compiler"
     "CMAKE_${cmake_lang}_COMPILER_LAUNCHER:${cmake_lang_desc} compiler launcher (e.g. ccache)"
     "CMAKE_${cmake_lang}_FLAGS:${cmake_lang_desc} compiler flags for all builds"
@@ -424,7 +429,7 @@ _cmake_define_lang_property_names() {
 # -----------------------------------
 (( $+functions[_cmake_define_common_property_names] )) ||
 _cmake_define_common_property_names() {
-  local properties; properties=(
+  local -a properties=(
     'CMAKE_MODULE_PATH:Search path for CMake modules (FindPROJECT.cmake)'
     'CMAKE_PREFIX_PATH:Search path for installations (PROJECTConfig.cmake)'
     'CMAKE_BUILD_TYPE:Specifies the build type for make based generators'
@@ -438,51 +443,87 @@ _cmake_define_common_property_names() {
     'CMAKE_UNITY_BUILD:Batch include source files'
   )
 
-  _describe -t 'common-property-names' 'common property name' properties $@
+  _describe -t 'common-property-names' 'common property name' properties "$@"
 }
 
-local _cmake_build_types=('Debug' 'Release' 'RelWithDebInfo' 'MinSizeRel')
-local _cmake_c_standards=(90 99 11)
-local _cmake_cxx_standards=(98 11 14 17 20)
-
 # ----------------------------
 # _cmake_define_property_values
 # ----------------------------
 (( $+functions[_cmake_define_property_values] )) ||
 _cmake_define_property_values() {
   local ret=1
+  local build_types=('Debug' 'Release' 'RelWithDebInfo' 'MinSizeRel')
+  local c_standards=(90 99 11 17 23)
+  local cxx_standards=(98 11 14 17 20 23)
+
   setopt localoptions extendedglob
   case $@[-1] in
-    (CMAKE_BUILD_TYPE)     _wanted build-types expl 'build type' _values 'build type' ${_cmake_build_types[@]} && ret=0;;
-    (BUILD_SHARED_LIBS)    _wanted booleans expl 'boolean' _cmake_booleans && ret=0;;
-    (CMAKE_CXX_STANDARD) _wanted cxx-standards expl 'cxx standard' _values 'cxx standard' ${_cmake_cxx_standards[@]} && ret=0;;
-    (CMAKE_C_STANDARD) _wanted c-standards expl 'c standard' _values 'c standard' ${_cmake_c_standards[@]} && ret=0;;
-    (CMAKE_TOOLCHAIN_FILE) _wanted toolchain-files expl 'file' _cmake_toolchain_files && ret=0;;
-    (CMAKE_COLOR_MAKEFILE) _wanted booleans expl 'boolean' _cmake_booleans && ret=0;;
-    (CMAKE_RULE_MESSAGES)  _wanted booleans expl 'boolean' _cmake_booleans && ret=0;;
-    (CMAKE_VERBOSE_MAKEFILE) _wanted booleans expl 'boolean' _cmake_booleans && ret=0;;
-    (CMAKE_UNITY_BUILD) _wanted booleans expl 'boolean' _cmake_booleans && ret=0;;
-    (CMAKE_INSTALL_PREFIX) _files -/ && ret=0;;
-    (CMAKE_EXPORT_COMPILE_COMMANDS) _wanted booleans expl 'boolean' _cmake_booleans && ret=0;;
-    (CMAKE_*_COMPILER)     _wanted compilers expl 'compiler' _cmake_compilers && ret=0;;
-    (CMAKE_*_COMPILER_LAUNCHER) _wanted compilers expl 'compiler launcher' _cmake_launchers && ret=0;;
-    (CMAKE_*_FLAGS(|_?*))  _message -e compiler-flags 'compiler flags' && _dispatch $service -value-,CPPFLAGS,-default- && ret=0;;
-    (CMAKE_*_STANDARD_REQUIRED) _wanted booleans expl 'boolean' _cmake_booleans && ret=0;;
-    (CMAKE_*_EXTENSIONS) _wanted booleans expl 'boolean' _cmake_booleans && ret=0;;
-    (*)                    _files && ret=0;;
+    (CMAKE_BUILD_TYPE)
+      _wanted build-types expl 'build type' _values 'build type' ${build_types[@]} && ret=0
+      ;;
+    (BUILD_SHARED_LIBS)
+      _wanted booleans expl 'boolean' _cmake_booleans && ret=0
+      ;;
+    (CMAKE_CXX_STANDARD)
+      _wanted cxx-standards expl 'cxx standard' _values 'cxx standard' ${cxx_standards[@]} && ret=0
+      ;;
+    (CMAKE_C_STANDARD)
+      _wanted c-standards expl 'c standard' _values 'c standard' ${c_standards[@]} && ret=0
+      ;;
+    (CMAKE_TOOLCHAIN_FILE)
+      _wanted toolchain-files expl 'file' _cmake_toolchain_files && ret=0
+      ;;
+    (CMAKE_COLOR_MAKEFILE)
+      _wanted booleans expl 'boolean' _cmake_booleans && ret=0
+      ;;
+    (CMAKE_RULE_MESSAGES)
+      _wanted booleans expl 'boolean' _cmake_booleans && ret=0
+      ;;
+    (CMAKE_VERBOSE_MAKEFILE)
+      _wanted booleans expl 'boolean' _cmake_booleans && ret=0
+      ;;
+    (CMAKE_UNITY_BUILD)
+      _wanted booleans expl 'boolean' _cmake_booleans && ret=0
+      ;;
+    (CMAKE_INSTALL_PREFIX)
+      _files -/ && ret=0
+      ;;
+    (CMAKE_EXPORT_COMPILE_COMMANDS)
+      _wanted booleans expl 'boolean' _cmake_booleans && ret=0
+      ;;
+    (CMAKE_*_COMPILER)
+      _wanted compilers expl 'compiler' _cmake_compilers && ret=0
+      ;;
+    (CMAKE_*_COMPILER_LAUNCHER)
+      _wanted compilers expl 'compiler launcher' _cmake_launchers && ret=0
+      ;;
+    (CMAKE_*_FLAGS(|_?*))
+      _message -e compiler-flags 'compiler flags' && _dispatch $service -value-,CPPFLAGS,-default- && ret=0
+      ;;
+    (CMAKE_*_STANDARD_REQUIRED)
+      _wanted booleans expl 'boolean' _cmake_booleans && ret=0
+      ;;
+    (CMAKE_*_EXTENSIONS)
+      _wanted booleans expl 'boolean' _cmake_booleans && ret=0
+      ;;
+    (*)
+      _files && ret=0
+      ;;
   esac
 
   return ret
 }
 
-local -a _cmake_generator_list=(${(f)"$(cmake --help | awk '/^Generators/{flag=1} flag && /^[* ] [^ ]/ {sub(/^[* ] /, ""); sub(/=.*$/, ""); sub(/\[arch\]/, ""); sub(/ *$/, ""); print}')"})
-
 # -----------------
 # _cmake_generators
 # -----------------
 (( $+functions[_cmake_generators] )) ||
 _cmake_generators() {
-  _describe -t generators 'generator' _cmake_generator_list
+  local -a generators=(
+    ${(f)"$(cmake --help | awk '/^Generators/{flag=1} flag && /^[* ] [^ ]/ {sub(/^[* ] /, ""); sub(/=.*$/, ""); sub(/\[arch\]/, ""); sub(/ *$/, ""); print}')"}
+  )
+
+  _describe -t generators 'generator' generators
 }
 
 # ----------------------
@@ -519,45 +560,46 @@ _cmake_launchers() {
   _command_names -e
 }
 
-local -a _cmake_commands=(
-  'capabilities:Report capabilities built into cmake in JSON format' \
-  'cat:concat the files and print them to the standard output' \
-  'chdir:run command in a given directory' \
-  'compare_files:check if file1 is same as file2' \
-  'copy:copy files to destination (either file or directory)' \
-  'copy_directory:copy content of <dir>... directories to destination directory' \
-  'copy_if_different:copy files if it has changed' \
-  'echo:displays arguments as text' \
-  'echo_append:displays arguments as text but no new line' \
-  'env:run command in a modified environment' \
-  'environment:display the current environment' \
-  'make_directory:create parent and <dir> directories' \
-  'md5sum:create MD5 checksum of files' \
-  'sha1sum:create SHA1 checksum of files' \
-  'sha224sum:create SHA224 checksum of files' \
-  'sha256sum:create SHA256 checksum of files' \
-  'sha384sum:create SHA384 checksum of files' \
-  'sha512sum:create SHA512 checksum of files' \
-  'remove:remove the file(s), use -f to force it' \
-  'remove_directory:remove directories and their contents' \
-  'rename:rename a file or directory (on one volume)' \
-  'rm:remove files or directories' \
-  'server:start cmake in server mode' \
-  'sleep:sleep for given number of seconds' \
-  'tar:create or extract a tar or zip archive' \
-  'time:run command and display elapsed time' \
-  'touch:touch a <file>' \
-  'touch_nocreate:touch a <file> but do not create it' \
-  'create_symlink:create a symbolic link new -> old' \
-  'create_hardlink:create a hard link new -> old' \
-  'true:do nothing with an exit code of 0' \
+(( $+functions[_cmake_commands] )) ||
+_cmake_commands() {
+  local -a commands=(
+    'capabilities:Report capabilities built into cmake in JSON format'
+    'cat:concat the files and print them to the standard output'
+    'chdir:run command in a given directory'
+    'compare_files:check if file1 is same as file2'
+    'copy:copy files to destination (either file or directory)'
+    'copy_directory:copy content of <dir>... directories to destination directory'
+    'copy_if_different:copy files if it has changed'
+    'echo:displays arguments as text'
+    'echo_append:displays arguments as text but no new line'
+    'env:run command in a modified environment'
+    'environment:display the current environment'
+    'make_directory:create parent and <dir> directories'
+    'md5sum:create MD5 checksum of files'
+    'sha1sum:create SHA1 checksum of files'
+    'sha224sum:create SHA224 checksum of files'
+    'sha256sum:create SHA256 checksum of files'
+    'sha384sum:create SHA384 checksum of files'
+    'sha512sum:create SHA512 checksum of files'
+    'remove:remove the file(s), use -f to force it'
+    'remove_directory:remove directories and their contents'
+    'rename:rename a file or directory (on one volume)'
+    'rm:remove files or directories'
+    'server:start cmake in server mode'
+    'sleep:sleep for given number of seconds'
+    'tar:create or extract a tar or zip archive'
+    'time:run command and display elapsed time'
+    'touch:touch a <file>'
+    'touch_nocreate:touch a <file> but do not create it'
+    'create_symlink:create a symbolic link new -> old'
+    'create_hardlink:create a hard link new -> old'
+    'true:do nothing with an exit code of 0'
     'false:do nothing with an exit code of 1'
   )
-_cmake_command() {
-  _arguments -C \
-    '-E[CMake command mode]:command:(("${_cmake_commands[@]}"))'
 
+  _describe -t commands 'command' commands
 }
+
 local cmake_suggest_build;cmake_suggest_build=(
     '--build[build]:build dir:_cmake_suggest_builddirs'
 )
@@ -573,21 +615,17 @@ elif [ $CURRENT -eq 2 ] ; then
     - help \
       "$cmake_help_actions[@]" \
     - command \
-      '-E[CMake command mode]:command:( )' \
+      '-E[CMake command mode]:command:_cmake_commands' \
     - build_opts \
       "$cmake_build_options[@]" \
     - build_cmds \
       "$cmake_suggest_build[@]" \
     - install_cmds \
       "$cmake_suggest_install[@]" && return 0
-elif [[ $words[2] = --help* ]] ; then
-  _cmake_help
 elif [[ $words[2] == --build ]] ; then
   _cmake_on_build
 elif [[ $words[2] == --install ]] ; then
   _cmake_on_install
-elif [[ $words[2] == -E ]]; then
-  _cmake_command
 else
   _arguments "$cmake_build_options[@]"
 fi

src/_gist

@@ -40,10 +40,10 @@
 #
 # ------------------------------------------------------------------------------
 
-local curcontext="$curcontext" state line ret=1
-typeset -A opt_args
+_gist() {
+  local ret=1
 
-_arguments -C \
+  _arguments \
     '(--login)--login[Authenticate gist on this computer.]' \
     '(-f --filename)'{-f,--filename}'[Sets the filename and syntax type.]:NAME' \
     '(-t --type)'{-t,--type}'[Sets the file extension and syntax type.]:EXT' \
@@ -51,19 +51,24 @@ _arguments -C \
     '(--no-private -p --private)--no-private[Makes your gist no private.]' \
     '(-d --description)'{-d,--description}'[Adds a description to your gist.]:DESCRIPTION' \
     '(-s --shorten)'{-s,--shorten}'[Shorten the gist URL using git.io.]' \
-  '(-u --update)'{-u,--update}'[Update an existing gist.]:URL ID:user_gists' \
+    '(-u --update)'{-u,--update}'[Update an existing gist.]:URL ID:_gist_ids' \
     '(-c --copy)'{-c,--copy}'[Copy the resulting URL to the clipboard]' \
     '(-e --embed)'{-e,--embed}'[Copy the embed code for the gist to the clipboard]' \
     '(-o --open --no-open)'{-o,--open}'[Open the resulting URL in a browser]' \
     '(--no-open -o --open)--no-open[No open the resulting URL in a browser]' \
+    '--skip-empty[Skip gisting empty files]' \
     '(-P --paste)'{-P,--paste}'[Paste from the clipboard to gist]' \
     '(-R --raw)'{-R,--raw}'[Display raw URL of the new gist]' \
     '(-l --list)'{-l,--list}'[List all gists for user ]::user' \
-  '(-h --help)'{-h,--help}'[print options help]' \
+    '--delete[Delete a gist]:id:_gist_ids' \
+    '(- *)'{-h,--help}'[print options help]' \
     '(-v --version)'{-v,--version}'[print version]' \
-  '(-r --read)'{-r,--read}'[Read a gist and print out the contents]:user gists:_gist_read_gists' \
+    '(-r --read)'{-r,--read}'[Read a gist and print out the contents]:user gists:_gist_ids' \
     '*: :_files' && ret=0
 
+  return ret
+}
+
 _gist_cache_policy() {
   # rebuild if cache is more than a day old
   local -a oldp
@@ -71,7 +76,7 @@ _gist_cache_policy() {
   (( $#oldp ))
 }
 
-_gist_read_gists() {
+_gist_ids() {
   local update_policy ret=1
   zstyle -s ":completion:${curcontext}:" cache-policy update_policy
   if [[ -z "$update_policy" ]]; then
@@ -79,43 +84,33 @@ _gist_read_gists() {
   fi
 
   # stores the gists of the logged in user in the format ID[Description]
-  _list=()
-  _cached_gists="user_gists"
+  local -a gist_list
 
   # retrieve/Write gists from/to cache
-  if _cache_invalid $_cached_gists  || ! _retrieve_cache $_cached_gists; then
-    _gists=$(gist -l)
+  if _cache_invalid gist_cached_list  || ! _retrieve_cache gist_cached_list; then
+    if (( $+commands[ruby] )); then
+      gist_list=(${(f)"$(gist -l | ruby -ne 'puts "#{$1}:#{$2}" if $_ =~ %r{/([^/ ]+)\s+(.+)}')"})
+    elif (( $+commands[perl])); then
+      gist_list=(${(f)"$(gist -l | perl -wln -e 'm{/([^/ ]+)\s+(.+)} and print qq($1:$2)')"})
+    fi
 
-    if [ $? -eq 0 ]; then
-      _store_cache $_cached_gists _gists
+    if [[ $? -eq 0 ]]; then
+      _store_cache gist_cached_list gist_list
     else
       # some error occurred, the user is probably not logged in
       # set _gists to an empty string so that no completion is attempted
-      _gists=""
+      gist_list=()
     fi
-  else
-    _retrieve_cache $_cached_gists
   fi
 
-  if [ -n "$_gists" ]; then
-    echo "$_gists" | while read -r line; do
-      # Splitting the gist -l output
-      url="$(echo "$line" | cut -d " " -f 1 | cut -d "/" -f 4)"
-      # gists w/o descriptions can have only one column in the output, those
-      # have their description set to an empty string
-      description="$(echo "$line" | awk '{if(NF > 1){$1=""; print $0}}')"
-
-      _list+=( "${url}[${description}]" )
-    done
-
-    _values "gists" $_list
-    ret=0
+  if [[ $#gist_list ]]; then
+    _describe -t gist_ids 'gist_ids' gist_list
   fi
 
   return ret
 }
 
-return ret
+_gist "$@"
 
 # Local Variables:
 # mode: Shell-Script

src/_git-flow

@@ -40,9 +40,7 @@
 #
 # ------------------------------------------------------------------------------
 
-
-_git-flow ()
-{
+_git-flow () {
   local curcontext="$curcontext" state line
   typeset -A opt_args
 
@@ -52,7 +50,6 @@ _git-flow ()
 
   case $state in
     (command)
-
       local -a subcommands
       subcommands=(
         'init:Initialize a new git repo with support for the branching model.'
@@ -67,28 +64,22 @@ _git-flow ()
 
     (options)
       case $line[1] in
-
         (init)
           _arguments \
             -f'[Force setting of gitflow branches, even if already configured]' \
             -d'[Use default branch naming conventions and prefixes]'
           ;;
-
         (version)
           ;;
-
         (hotfix)
           __git-flow-hotfix
           ;;
-
         (release)
           __git-flow-release
           ;;
-
         (feature)
           __git-flow-feature
           ;;
-
         (support)
           __git-flow-support
           ;;
@@ -98,8 +89,7 @@ _git-flow ()
   esac
 }
 
-__git-flow-release ()
-{
+__git-flow-release () {
   local curcontext="$curcontext" state line
   typeset -A opt_args
 
@@ -109,7 +99,6 @@ __git-flow-release ()
 
   case $state in
     (command)
-
       local -a subcommands
       subcommands=(
         'start:Start a new release branch.'
@@ -125,13 +114,11 @@ __git-flow-release ()
 
     (options)
       case $line[1] in
-
         (start)
           _arguments \
             -F'[Fetch from origin before performing finish]'\
             ':version:__git_flow_version_list'
           ;;
-
         (finish)
           _arguments \
             -F'[Fetch from origin before performing finish]' \
@@ -143,19 +130,14 @@ __git-flow-release ()
             -k'[Keep branch after performing finish]'\
             ':version:__git_flow_version_list'
           ;;
-
         (publish)
           _arguments \
             ':version:__git_flow_version_list'
           ;;
-
         (track)
           _arguments \
             ':version:__git_flow_version_list'
           ;;
-
-
-
         *)
           _arguments \
             -v'[Verbose (more) output]'
@@ -165,8 +147,7 @@ __git-flow-release ()
   esac
 }
 
-__git-flow-hotfix ()
-{
+__git-flow-hotfix () {
   local curcontext="$curcontext" state line
   typeset -A opt_args
 
@@ -176,7 +157,6 @@ __git-flow-hotfix ()
 
   case $state in
     (command)
-
       local -a subcommands
       subcommands=(
         'start:Start a new hotfix branch.'
@@ -191,12 +171,11 @@ __git-flow-hotfix ()
 
     (options)
       case $line[1] in
-
         (start)
           _arguments \
             -F'[Fetch from origin before performing finish]'\
             ':hotfix:__git_flow_version_list'\
-						':branch-name:__git_branch_names'
+            ':branch-name:__git_flow_branch_names'
           ;;
 
         (finish)
@@ -223,8 +202,7 @@ __git-flow-hotfix ()
   esac
 }
 
-__git-flow-feature ()
-{
+__git-flow-feature () {
   local curcontext="$curcontext" state line
   typeset -A opt_args
 
@@ -234,7 +212,6 @@ __git-flow-feature ()
 
   case $state in
     (command)
-
       local -a subcommands
       subcommands=(
         'start:Start a new feature branch.'
@@ -254,12 +231,11 @@ __git-flow-feature ()
 
     (options)
       case $line[1] in
-
         (start)
           _arguments \
             -F'[Fetch from origin before performing finish]'\
             ':feature:__git_flow_feature_list'\
-						':branch-name:__git_branch_names'
+            ':branch-name:__git_flow_branch_names'
           ;;
 
         (finish)
@@ -283,13 +259,13 @@ __git-flow-feature ()
 
         (diff)
           _arguments \
-						':branch:__git_branch_names'\
+            ':branch:__git_flow_branch_names'\
             ;;
 
         (rebase)
           _arguments \
             -i'[Do an interactive rebase]' \
-						':branch:__git_branch_names'
+            ':branch:__git_flow_branch_names'
           ;;
 
         (checkout)
@@ -299,8 +275,8 @@ __git-flow-feature ()
 
         (pull)
           _arguments \
-						':remote:__git_remotes'\
-						':branch:__git_branch_names'
+            ':remote:__git_flow_remote'\
+            ':branch:__git_flow_branch_names'
           ;;
 
         *)
@@ -312,8 +288,7 @@ __git-flow-feature ()
   esac
 }
 
-__git-flow-support ()
-{
+__git-flow-support() {
   local curcontext="$curcontext" state line
   typeset -A opt_args
 
@@ -341,7 +316,7 @@ __git-flow-support ()
           _arguments \
             -F'[Fetch from origin before performing finish]'\
             ':feature:__git_flow_support_list'\
-						':branch-name:__git_branch_names'
+            ':branch-name:__git_flow_branch_names'
           ;;
 
         *)
@@ -353,36 +328,30 @@ __git-flow-support ()
   esac
 }
 
-__git_flow_version_list ()
-{
+__git_flow_version_list() {
   local expl
-	declare -a versions
-
-	versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null | tr -d ' |*')"}})
-	__git_command_successful || return
+  local -a versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null | tr -d ' |*')"}})
+  __git_flow_command_successful || return
 
   _wanted versions expl 'version' compadd $versions
 }
 
-__git_flow_feature_list ()
-{
+__git_flow_feature_list() {
   local expl
-	declare -a features
-
-	features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null | tr -d ' |*')"}})
-	__git_command_successful || return
+  local -a features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null | tr -d ' |*')"}})
+  __git_flow_command_successful || return
 
   _wanted features expl 'feature' compadd $features
 }
 
-__git_remotes () {
+__git_flow_remote() {
   local expl gitdir remotes
 
   gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
-	__git_command_successful || return
+  __git_flow_command_successful || return
 
   remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
-	__git_command_successful || return
+  __git_flow_command_successful || return
 
   # TODO: Should combine the two instead of either or.
   if (( $#remotes > 0 )); then
@@ -392,40 +361,31 @@ __git_remotes () {
   fi
 }
 
-__git_flow_hotfix_list ()
-{
+__git_flow_hotfix_list() {
   local expl
-	declare -a hotfixes
-
-	hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null | tr -d ' |*')"}})
-	__git_command_successful || return
+  local -a hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null | tr -d ' |*')"}})
+  __git_flow_command_successful || return
 
   _wanted hotfixes expl 'hotfix' compadd $hotfixes
 }
 
-__git_flow_support_list ()
-{
+__git_flow_support_list() {
   local expl
-	declare -a support
-
-	support=(${${(f)"$(_call_program support git flow support list 2> /dev/null | tr -d ' |*')"}})
-	__git_command_successful || return
+  local -a support=(${${(f)"$(_call_program support git flow support list 2> /dev/null | tr -d ' |*')"}})
+  __git_flow_command_successful || return
 
   _wanted hotfixes expl 'support' compadd $support
 }
 
-
-__git_branch_names () {
+__git_flow_branch_names() {
   local expl
-	declare -a branch_names
-
-	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
-	__git_command_successful || return
+  local -a branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
+  __git_flow_command_successful || return
 
   _wanted branch-names expl branch-name compadd $* - $branch_names
 }
 
-__git_command_successful () {
+__git_flow_command_successful() {
   if (( ${#pipestatus:#0} > 0 )); then
     _message 'not a git repository'
     return 1

src/_hello

@@ -13,7 +13,16 @@
 #
 # ------------------------------------------------------------------------------
 
-_arguments -s '(- *)'{-h,--help}'[display this help and exit]' \
+_arguments -s \
+  '(- *)'{-h,--help}'[display this help and exit]' \
   '(- *)'{-v,--version}'[display version information and exit]' \
   {-t,--traditional}'[use traditional greeting]' \
   {-g,--greeting=}'[use TEXT as the greeting message]:TEXT'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

src/_hledger

@@ -284,3 +284,11 @@ while (( $#state )); do
 done
 
 return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

src/_kitchen

@@ -84,3 +84,11 @@ _kitchen_instances() {
 }
 
 _kitchen "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

src/_middleman

@@ -154,3 +154,11 @@ case $state in
 esac
 
 return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

src/_mix

@@ -126,8 +126,7 @@ _1st_arguments=(
   '--version:Prints the Elixir version information'
 )
 
-__task_list ()
-{
+__task_list () {
   local expl
   declare -a tasks
 
@@ -211,7 +210,6 @@ __task_list ()
 }
 
 local expl
-
 local curcontext="$curcontext" state line
 typeset -A opt_args
 
@@ -222,19 +220,23 @@ _arguments -C \
 case $state in
   (command)
     _describe -t commands "mix subcommand" _1st_arguments
-      return
     ;;
-
   (options)
     case $line[1] in
       (help)
         _arguments ':feature:__task_list'
-         return
         ;;
       (test|format|run)
         _arguments ':PATH:_files'
-         return
         ;;
     esac
   ;;
 esac
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

src/_mssh

@@ -106,3 +106,11 @@ _describe 'command' instances
 # Reference:
 #   https://zsh.sourceforge.net/Doc/Release/Completion-System.html
 #   https://github.com/zsh-users/zsh-completions/blob/master/zsh-completions-howto.org
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

src/_neofetch

@@ -144,3 +144,11 @@ local options=(
 )
 
 _arguments $options "*::func_name:($func_names)"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

src/_nftables

@@ -12,22 +12,23 @@
 #  * Markus Richter ( https://github.com/mqus , <mqus@disroot.org>)
 #
 # ------------------------------------------------------------------------------
+
 _nft(){
   local -a rules states prev args families options descriptors
   local state="start" line nextstate cmd_obj cmd_subcmd cmd_fam cmd_tab cmd_chain #curcontext="$curcontext"
 
   options=(
-  '(-)'{-h,--help}'[show help]' \
-  '(-)'{-v,--version}'[print version information]' \
-  "(-i --interactive)"{-i,--interactive}'[read input from interactive CLI]: :->end' \
-  "(-f --file)"{-f,--file}'[read input from <filename>]:nftables rule file:_files' \
-  '(-c --check -n --numeric -N)'{-c,--check}"[check command's validity without actually applying the changes]" \
-  '(-j --json)'{-j,--json}'[format output in json]' \
-  '(-c --check -N)*'{-n,--numeric}'[can be specified up to 3 times, Shows 1:network addresses(default behaviour), 2:internet services (port numbers) and 3:protocols, user IDs, and group IDs numerically]' \
-  '(-s --stateless)'{-s,--stateless}'[omit stateful information of ruleset]' \
-  '(-N -n --numeric -c --check)'-N'[translate IP addresses to names]' \
-  '(-a --handle)'{-a,--handle}'[output rule handle]' \
-  '(-e --echo)'{-e,--echo}'[echo what has been added, inserted or replaced]' \
+    '(-)'{-h,--help}'[show help]'
+    '(-)'{-v,--version}'[print version information]'
+    "(-i --interactive)"{-i,--interactive}'[read input from interactive CLI]: :->end'
+    "(-f --file)"{-f,--file}'[read input from <filename>]:nftables rule file:_files'
+    '(-c --check -n --numeric -N)'{-c,--check}"[check command's validity without actually applying the changes]"
+    '(-j --json)'{-j,--json}'[format output in json]'
+    '(-c --check -N)*'{-n,--numeric}'[can be specified up to 3 times, Shows 1:network addresses(default behaviour), 2:internet services (port numbers) and 3:protocols, user IDs, and group IDs numerically]'
+    '(-s --stateless)'{-s,--stateless}'[omit stateful information of ruleset]'
+    '(-N -n --numeric -c --check)'-N'[translate IP addresses to names]'
+    '(-a --handle)'{-a,--handle}'[output rule handle]'
+    '(-e --echo)'{-e,--echo}'[echo what has been added, inserted or replaced]'
     {-I,--includepath}'[add specified directory to the paths searched for include files]:include directory [/usr/share]:include directory:_directories'
   )
 
@@ -284,6 +285,7 @@ _nft_subcommands(){
   )
   _describe -t commands 'nft subcommand' commands "$@"
 }
+
 _nft_mon_filter(){
   local monitor_filters=(
     'new:show only events of created objects'

src/_openvpn3

@@ -225,7 +225,7 @@ _openvpn3_command() {
     _describe -t commands 'openvpn3 commands' openvpn3_cmds
   else
     local curcontext="$curcontext"
-    cmd="${${openvpn3_cmds[(r)$words[1]:*]%%:*}}"
+    local cmd="${${openvpn3_cmds[(r)$words[1]:*]%%:*}}"
     if (($#cmd)); then
       if (( $+functions[_openvpn3_$cmd] )); then
         _openvpn3_$cmd

src/_setcap

@@ -121,10 +121,10 @@ _setcap_capabilities() {
 
 _setcap "$@"
 
-# Local variables:
+# Local Variables:
 # mode: Shell-Script
 # sh-indentation: 2
 # indent-tabs-mode: nil
 # sh-basic-offset: 2
 # End:
-# ex: sw=2 ts=2 et filetype=sh
+# vim: ft=zsh sw=2 ts=2 et

src/_tmuxp

@@ -93,8 +93,8 @@ _tmuxp() {
             && ret=0
           ;;
         (shell)
-          local sessions="$(__tmux_sessions)"
-          local windows="$(__tmux_windows)"
+          local sessions="$(__tmuxp_tmux_sessions)"
+          local windows="$(__tmuxp_tmux_windows)"
           _arguments \
             '(- *)'{-h,--help}'[show  help message and exit]' \
             '-S[pass-through for tmux -S]: :_files' \
@@ -179,15 +179,13 @@ __tmuxp_import() {
   esac
 }
 
-__tmux_sessions () {
-  local tmux_sessions
-  tmux_sessions=($(_call_program tmux_sessions 'tmux ls -F "#{session_name}"'))
+__tmuxp_tmux_sessions() {
+  local tmux_sessions=($(_call_program tmux_sessions 'tmux ls -F "#{session_name}"'))
   echo $tmux_sessions
 }
 
-__tmux_windows () {
-  local tmux_windows
-  tmux_windows=($(_call_program tmux_sessions 'tmux ls -F "#{window_name}"'))
+__tmuxp_tmux_windows() {
+  local tmux_windows=($(_call_program tmux_sessions 'tmux ls -F "#{window_name}"'))
   echo $tmux_windows
 }
 

src/_wg-quick

@@ -23,3 +23,11 @@ local modes=('up\:"bring a wireguard interface up"'\
 # 2: Complete interface with all .conf files in /etc/wireguard without the filename extension.
 _arguments "1:mode:((${modes}))"\
   '2:interface:_path_files -W /etc/wireguard -g "*.conf(^/:r)"'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et