summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_ansible14
2 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 290b1f1b2..3782b0d2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2024-03-18 Oliver Kiddle <opk@zsh.org>
+ * 52769: Completion/Unix/Command/_ansible: fix completion of
+ ansible keywords and --step option
+
* 52750: Config/defs.mk.in, Etc/zsh-development-guide,
Src/Makemod.in.in, Src/Modules/files.c, Src/Modules/watch.c,
Src/Modules/zftp.c, Src/Modules/zprof.c, Src/Zle/compcore.c,
diff --git a/Completion/Unix/Command/_ansible b/Completion/Unix/Command/_ansible
index bf31819ad..e0d9fb9b6 100644
--- a/Completion/Unix/Command/_ansible
+++ b/Completion/Unix/Command/_ansible
@@ -69,6 +69,11 @@ case $service in
"--skip-tags[only run plays and tasks whose tags don't match]"
)
;|
+ ansible-playbook|ansible-console)
+ args+=(
+ '--step[one-step-at-a-time: confirm each task before running]'
+ )
+ ;|
ansible|ansible-console)
args+=(
'--task-timeout[set the task timeout limit]:timeout (seconds)'
@@ -97,11 +102,6 @@ case $service in
'*::args:->config'
)
;;
- ansible-console)
- args+=(
- '--step[one-step-at-a-time: confirm each task before running]'
- )
- ;;
ansible-doc)
args+=(
'!--metadata-dump' '!--no-fail-on-errors' # "internal use only"
@@ -440,11 +440,11 @@ if [[ $state = plugins ]]; then
typeset -ga ${plug}
if zstyle -T ":completion:${curcontext}:plugins" verbose; then
(( ${(P)#plugvar} )) || set -A ${plugvar} \
- ${${(f)"$(_call_program plugins ansible-doc -t $plug -l)"}/ ##/:}
+ ${${${(f)"$(_call_program plugins ansible-doc -t $plug -l)"}:# *}/(:|) ##/:}
_describe -t plugins "${plug} plugin" $plugvar -M 'r:|.=* r:|=*' && ret=0
else
(( ${(P)#plugvar} )) || set -A ${plugvar} \
- ${${(f)"$(_call_program plugins ansible-doc -t $plug -F)"}%% *}
+ ${${(f)"$(_call_program plugins ansible-doc -t $plug -F)"}%%(|:) *}
_wanted plugins expl "${plug} plugin" compadd -M 'r:|.=* r:|=*' -a $plugvar && ret=0
fi
fi