Consolidate zsh completions in one file for homebrew

README.md

@@ -336,8 +336,14 @@ export FORGIT_LOG_FZF_OPTS='
 
 ## Zsh
 
-- Put [`completions/_git-forgit`](completions/_git-forgit) in a directory in your `$fpath` (e.g. `/usr/share/zsh/site-functions`) to have zsh tab completion for `git forgit` and configured git aliases.
-- Source [`completions/git-forgit.zsh`](completions/git-forgit.zsh) to have zsh tab completion for forgit shell functions and aliases (e.g. `gcb <tab>` completes branches).
+- Put [`completions/_git-forgit`](completions/_git-forgit) in a directory in your `$fpath` (e.g. `/usr/share/zsh/site-functions`) to have zsh tab completion for `git forgit` and configured git aliases, as well as shell command aliases, such as `forgit::add` and `ga`
+
+If you're having issues after updating, and commands such as `forgit::add` or aliases `ga` aren't working, remove your completions cache and restart your shell.
+
+```zsh
+> rm ~/.zcompdump
+> zsh
+```
 
 # 💡 Tips
 

completions/_git-forgit

@@ -1,12 +1,10 @@
-#compdef git-forgit
+#compdef git-forgit forgit::add forgit::branch::delete forgit::checkout::branch forgit::checkout::commit forgit::checkout::file forgit::checkout::tag forgit::cherry::pick forgit::cherry::pick::from::branch forgit::clean forgit::diff forgit::fixup forgit::log forgit::rebase forgit::reset::head forgit::revert::commit forgit::stash::show
 #description Utility tool for using git interactively
 #
 # forgit completions for zsh
 #
 # Place this file in your $fpath (e.g. /usr/share/zsh/site-functions) to enable
-# tab completions for forgit as a git subcommmand. When using forgit as a shell
-# plugin, additionally source completions/git-forgit.zsh after
-# forgit.plugin.zsh to enable tab completion for shell functions and aliases.
+# tab completions for forgit.
 
 _git-branches() {
 	_alternative "branches:branchname:($(git branch -a --format '%(refname:short)'))"
@@ -99,3 +97,28 @@ _git-forgit() {
 		;;
 	esac
 }
+
+# Check if forgit plugin is loaded
+if (( $+functions[forgit::add] )); then
+	# We're reusing existing completion functions, so load those first
+	# if not already loaded and check if completion function exists afterwards.
+	(( $+functions[_git-add] )) || _git
+	(( $+functions[_git-add] )) || return 1
+	# Completions for forgit plugin shell functions (also works for aliases)
+	compdef _git-add forgit::add
+	compdef _git-branches forgit::branch::delete
+	compdef _git-branches forgit::checkout::branch
+	compdef __git_recent_commits forgit::checkout::commit
+	compdef _git-checkout-file forgit::checkout::file
+	compdef __git_tags forgit::checkout::tag
+	compdef _git-cherry-pick forgit::cherry::pick
+	compdef _git-branches forgit::cherry::pick::from::branch
+	compdef _git-clean forgit::clean
+	compdef _git-forgit-diff forgit::diff
+	compdef __git_branch_names forgit::fixup
+	compdef _git-log forgit::log
+	compdef _git-rebase forgit::rebase
+	compdef _git-staged forgit::reset::head
+	compdef __git_recent_commits forgit::revert::commit
+	compdef _git-stash-show forgit::stash::show
+fi