ci: check syntax for functions/* and completions/_*

Co-authored-by: robbyrussell <257+robbyrussell@users.noreply.github.com>

.github/workflows/main.yml

@@ -36,6 +36,8 @@ jobs:
         run: |
           for file in ./oh-my-zsh.sh \
                       ./lib/*.zsh \
+                      ./functions/* \
+                      ./completions/_* \
                       ./plugins/*/*.plugin.zsh \
                       ./plugins/*/_* \
                       ./themes/*.zsh-theme; do

completions/_omz

@@ -0,0 +1,90 @@
+#compdef omz
+
+local -a cmds subcmds
+cmds=(
+  'changelog:Print the changelog'
+  'help:Usage information'
+  'plugin:Manage plugins'
+  'pr:Manage Oh My Zsh Pull Requests'
+  'reload:Reload the current zsh session'
+  'shop:Open the Oh My Zsh shop'
+  'theme:Manage themes'
+  'update:Update Oh My Zsh'
+  'version:Show the version'
+)
+
+if (( CURRENT == 2 )); then
+  _describe 'command' cmds
+elif (( CURRENT == 3 )); then
+  case "$words[2]" in
+    changelog) local -a refs
+      refs=("${(@f)$(builtin cd -q "$ZSH"; command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
+      _describe 'command' refs ;;
+    plugin) subcmds=(
+      'disable:Disable plugin(s)'
+      'enable:Enable plugin(s)'
+      'info:Get plugin information'
+      'list:List plugins'
+      'load:Load plugin(s)'
+    )
+      _describe 'command' subcmds ;;
+    pr) subcmds=('clean:Delete all Pull Request branches' 'test:Test a Pull Request')
+      _describe 'command' subcmds ;;
+    theme) subcmds=('list:List themes' 'set:Set a theme in your .zshrc file' 'use:Load a theme')
+      _describe 'command' subcmds ;;
+  esac
+elif (( CURRENT == 4 )); then
+  case "${words[2]}::${words[3]}" in
+    plugin::(disable|enable|load))
+      local -aU valid_plugins
+
+      if [[ "${words[3]}" = disable ]]; then
+        # if command is "disable", only offer already enabled plugins
+        valid_plugins=($plugins)
+      else
+        valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
+        # if command is "enable", remove already enabled plugins
+        [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
+      fi
+
+      _describe 'plugin' valid_plugins ;;
+    plugin::info)
+      local -aU plugins
+      plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
+      _describe 'plugin' plugins ;;
+    plugin::list)
+      local -a opts
+      opts=('--enabled:List enabled plugins only')
+      _describe -o 'options' opts ;;
+    theme::(set|use))
+      local -aU themes
+      themes=("$ZSH"/themes/*.zsh-theme(-.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(-.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
+      _describe 'theme' themes ;;
+  esac
+elif (( CURRENT > 4 )); then
+  case "${words[2]}::${words[3]}" in
+    plugin::(enable|disable|load))
+      local -aU valid_plugins
+
+      if [[ "${words[3]}" = disable ]]; then
+        # if command is "disable", only offer already enabled plugins
+        valid_plugins=($plugins)
+      else
+        valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
+        # if command is "enable", remove already enabled plugins
+        [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
+      fi
+
+      # Remove plugins already passed as arguments
+      # NOTE: $(( CURRENT - 1 )) is the last plugin argument completely passed, i.e. that which
+      # has a space after them. This is to avoid removing plugins partially passed, which makes
+      # the completion not add a space after the completed plugin.
+      local -a args
+      args=(${words[4,$(( CURRENT - 1))]})
+      valid_plugins=(${valid_plugins:|args})
+
+      _describe 'plugin' valid_plugins ;;
+  esac
+fi
+
+return 0

functions/omz

@@ -1,5 +1,3 @@
-#!/usr/bin/env zsh
-
 function omz {
   setopt localoptions noksharrays
   [[ $# -gt 0 ]] || {
@@ -20,102 +18,6 @@ function omz {
   _omz::$command "$@"
 }
 
-function _omz {
-  local -a cmds subcmds
-  cmds=(
-    'changelog:Print the changelog'
-    'help:Usage information'
-    'plugin:Manage plugins'
-    'pr:Manage Oh My Zsh Pull Requests'
-    'reload:Reload the current zsh session'
-    'shop:Open the Oh My Zsh shop'
-    'theme:Manage themes'
-    'update:Update Oh My Zsh'
-    'version:Show the version'
-  )
-
-  if (( CURRENT == 2 )); then
-    _describe 'command' cmds
-  elif (( CURRENT == 3 )); then
-    case "$words[2]" in
-      changelog) local -a refs
-        refs=("${(@f)$(builtin cd -q "$ZSH"; command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
-        _describe 'command' refs ;;
-      plugin) subcmds=(
-        'disable:Disable plugin(s)'
-        'enable:Enable plugin(s)'
-        'info:Get plugin information'
-        'list:List plugins'
-        'load:Load plugin(s)'
-      )
-        _describe 'command' subcmds ;;
-      pr) subcmds=('clean:Delete all Pull Request branches' 'test:Test a Pull Request')
-        _describe 'command' subcmds ;;
-      theme) subcmds=('list:List themes' 'set:Set a theme in your .zshrc file' 'use:Load a theme')
-        _describe 'command' subcmds ;;
-    esac
-  elif (( CURRENT == 4 )); then
-    case "${words[2]}::${words[3]}" in
-      plugin::(disable|enable|load))
-        local -aU valid_plugins
-
-        if [[ "${words[3]}" = disable ]]; then
-          # if command is "disable", only offer already enabled plugins
-          valid_plugins=($plugins)
-        else
-          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
-          # if command is "enable", remove already enabled plugins
-          [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
-        fi
-
-        _describe 'plugin' valid_plugins ;;
-      plugin::info)
-        local -aU plugins
-        plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
-        _describe 'plugin' plugins ;;
-      plugin::list)
-        local -a opts
-        opts=('--enabled:List enabled plugins only')
-        _describe -o 'options' opts ;;
-      theme::(set|use))
-        local -aU themes
-        themes=("$ZSH"/themes/*.zsh-theme(-.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(-.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
-        _describe 'theme' themes ;;
-    esac
-  elif (( CURRENT > 4 )); then
-    case "${words[2]}::${words[3]}" in
-      plugin::(enable|disable|load))
-        local -aU valid_plugins
-
-        if [[ "${words[3]}" = disable ]]; then
-          # if command is "disable", only offer already enabled plugins
-          valid_plugins=($plugins)
-        else
-          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
-          # if command is "enable", remove already enabled plugins
-          [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
-        fi
-
-        # Remove plugins already passed as arguments
-        # NOTE: $(( CURRENT - 1 )) is the last plugin argument completely passed, i.e. that which
-        # has a space after them. This is to avoid removing plugins partially passed, which makes
-        # the completion not add a space after the completed plugin.
-        local -a args
-        args=(${words[4,$(( CURRENT - 1))]})
-        valid_plugins=(${valid_plugins:|args})
-
-        _describe 'plugin' valid_plugins ;;
-    esac
-  fi
-
-  return 0
-}
-
-# If run from a script, do not set the completion function
-if (( ${+functions[compdef]} )); then
-  compdef _omz omz
-fi
-
 ## Utility functions
 
 function _omz::confirm {
@@ -942,3 +844,5 @@ function _omz::version {
     printf "%s (%s)\n" "$version" "$commit"
   )
 }
+
+omz "$@"

functions/omz_diagnostic_dump

@@ -1,4 +1,4 @@
-# diagnostics.zsh
+# omz_diagnostic_dump
 #
 # Diagnostic and debugging support for oh-my-zsh
 
@@ -351,3 +351,5 @@ function _omz_diag_dump_os_specific_version() {
   done
 }
 
+
+omz_diagnostic_dump "$@"

oh-my-zsh.sh

@@ -78,6 +78,9 @@ fpath=($ZSH/{functions,completions} $ZSH_CUSTOM/{functions,completions} $fpath)
 # Load all stock functions (from $fpath files) called below.
 autoload -U compaudit compinit zrecompile
 
+# The omz CLI and omz_diagnostic_dump are loaded on first use
+autoload -Uz omz omz_diagnostic_dump
+
 is_plugin() {
   local base_dir=$1
   local name=$2
@@ -110,89 +113,9 @@ if [[ -z "$ZSH_COMPDUMP" ]]; then
   ZSH_COMPDUMP="${ZDOTDIR:-$HOME}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
 fi
 
-# Resolve the commit $ZSH is checked out at into $REPLY by reading the git
-# directory, so that no git process is forked on every startup.
-# Handles .git files (worktrees, submodules), worktree common dirs, detached
-# HEADs and packed refs. Returns 1 if anything is unexpected.
-_omz_git_head() {
-  local gitdir="$ZSH/.git" common head ref
-  local -a lines
-  REPLY=
-
-  # .git may be a file pointing at the real git dir
-  if [[ -f "$gitdir" ]]; then
-    read -r head 2>/dev/null < "$gitdir" || return 1
-    [[ "$head" = "gitdir: "* ]] || return 1
-    gitdir="${head#gitdir: }"
-    [[ -n "$gitdir" ]] || return 1
-    [[ "$gitdir" = /* ]] || gitdir="$ZSH/$gitdir"
-  fi
-
-  # worktrees keep their refs in the common git dir
-  common="$gitdir"
-  if [[ -f "$gitdir/commondir" ]]; then
-    read -r common 2>/dev/null < "$gitdir/commondir" || return 1
-    [[ "$common" = /* ]] || common="$gitdir/$common"
-  fi
-
-  [[ -r "$gitdir/HEAD" ]] || return 1
-  read -r head 2>/dev/null < "$gitdir/HEAD" || return 1
-
-  if [[ "$head" = ref:\ * ]]; then
-    ref="${head#ref: }"
-
-    # Only use well-formed full ref names as paths. Besides matching Git's ref
-    # rules, this prevents a malformed HEAD from escaping the git directory.
-    [[ "$ref" = refs/?* \
-      && "$ref" != *..* \
-      && "$ref" != *//* \
-      && "$ref" != */ \
-      && "$ref" != */.* \
-      && "$ref" != *.lock \
-      && "$ref" != *.lock/* \
-      && "$ref" != *. \
-      && "$ref" != *'@{'* \
-      && "$ref" != *[[:cntrl:]\ \~\^\:\?\*\[\\]* \
-    ]] || return 1
-
-    case "$ref" in
-      # These namespaces are private to each worktree and are never resolved
-      # from the common directory or its packed-refs file.
-      refs/bisect/*|refs/worktree/*|refs/rewritten/*)
-        [[ -r "$gitdir/$ref" ]] || return 1
-        read -r REPLY 2>/dev/null < "$gitdir/$ref" || return 1
-        ;;
-      *)
-        if [[ -r "$common/$ref" ]]; then
-          read -r REPLY 2>/dev/null < "$common/$ref" || return 1
-        elif [[ -r "$common/packed-refs" ]]; then
-          lines=("${(@f)$(<"$common/packed-refs")}")
-          REPLY="${lines[(r)* ${(b)ref}]%% *}"
-        else
-          return 1
-        fi
-        ;;
-    esac
-  else
-    # detached HEAD: the file holds the commit itself
-    REPLY="$head"
-  fi
-
-  # only an object ID is a usable answer: a symbolic ref, a malformed file or
-  # a missed packed entry all fall through to the git fallback instead
-  [[ -n "$REPLY" && -z "${REPLY//[0-9a-f]/}" ]] \
-    && (( ${#REPLY} == 40 || ${#REPLY} == 64 ))
-}
-
-# Construct zcompdump OMZ metadata. The helper reports through $REPLY, so
-# call it in a scope that keeps that out of the global namespace.
-() {
-  local REPLY
-  _omz_git_head || REPLY="$(builtin cd -q "$ZSH"; git rev-parse HEAD 2>/dev/null)"
-  typeset -g zcompdump_revision="#omz revision: $REPLY"
-}
+# Construct zcompdump OMZ metadata
+zcompdump_revision="#omz revision: $(builtin cd -q "$ZSH"; git rev-parse HEAD 2>/dev/null)"
 zcompdump_fpath="#omz fpath: $fpath"
-unset -f _omz_git_head
 
 # Delete the zcompdump file if OMZ zcompdump metadata changed
 if ! command grep -q -Fx "$zcompdump_revision" "$ZSH_COMPDUMP" 2>/dev/null \