diff options
| author | Daniel Shahaf <danielsh@apache.org> | 2020-02-17 09:56:54 +0000 |
|---|---|---|
| committer | Daniel Shahaf <danielsh@apache.org> | 2020-02-19 10:18:30 +0000 |
| commit | 50df0e0bb9309319af9a3ee59a31766d3f1ba6bf (patch) | |
| tree | 087068dd2e18227e61dbd7a73ce7cd5991150f44 | |
| parent | 69c247de2ff3ca41be93cd90af539926418d023d (diff) | |
| download | zsh-50df0e0bb9309319af9a3ee59a31766d3f1ba6bf.tar.gz zsh-50df0e0bb9309319af9a3ee59a31766d3f1ba6bf.tar.xz zsh-50df0e0bb9309319af9a3ee59a31766d3f1ba6bf.zip | |
45447: Complete vcs_info_hookadd and vcs_info_hookdel. Expose _vcs_info_hooks as a top-level helper function.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Completion/Zsh/Command/_zstyle | 3 | ||||
| -rw-r--r-- | Completion/Zsh/Function/_vcs_info | 31 | ||||
| -rw-r--r-- | Completion/Zsh/Type/_vcs_info_hooks | 2 |
4 files changed, 41 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 5fabad45c..1dea4c9d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-02-19 Daniel Shahaf <danielsh@apache.org> + + * 45447: Completion/Zsh/Command/_zstyle, + Completion/Zsh/Function/_vcs_info, + Completion/Zsh/Type/_vcs_info_hooks: Complete vcs_info_hookadd + and vcs_info_hookdel. Expose _vcs_info_hooks as a top-level + helper function. + 2020-02-18 Chris Down <chris@chrisdown.name> * 45463: Test/B11kill.ztst: test: kill: Document why we use diff --git a/Completion/Zsh/Command/_zstyle b/Completion/Zsh/Command/_zstyle index 7db73c0c0..07b60605f 100644 --- a/Completion/Zsh/Command/_zstyle +++ b/Completion/Zsh/Command/_zstyle @@ -5,9 +5,6 @@ local nm=$compstate[nmatches] taglist patterns contexts MATCH integer MBEGIN MEND typeset -A opt_args styles -_vcs_info_hooks() { - compadd - ${functions[(I)+vi-*]#+vi-} -} # Assoc array of styles; the values give the possible top-level # contexts: # c completion diff --git a/Completion/Zsh/Function/_vcs_info b/Completion/Zsh/Function/_vcs_info new file mode 100644 index 000000000..fdb28de6a --- /dev/null +++ b/Completion/Zsh/Function/_vcs_info @@ -0,0 +1,31 @@ +#compdef vcs_info_hookadd vcs_info_hookdel + +local -a hook_types=( + gen-applied-string + gen-hg-bookmark-string + gen-mqguards-string + gen-unapplied-string + no-vcs + post-backend + post-quilt + pre-addon-quilt + pre-get-data + set-branch-format + set-hgrev-format + set-message + set-patch-format + start-up +) + +local -a specs +case $service in + (vcs_info_hookdel) + specs=( '-a[remove all occurrences, not just the first]' ) + ;; +esac + +# TODO: for vcs_info_hookdel complete only functions installed for that hook +_arguments : \ + $specs \ + ":hook type:($hook_types)" \ + '*:hook function:_vcs_info_hooks' diff --git a/Completion/Zsh/Type/_vcs_info_hooks b/Completion/Zsh/Type/_vcs_info_hooks new file mode 100644 index 000000000..bad915000 --- /dev/null +++ b/Completion/Zsh/Type/_vcs_info_hooks @@ -0,0 +1,2 @@ +#autoload +compadd - ${functions[(I)+vi-*]#+vi-} |