cleanup: Pull built-in widget actions into global variable

This commit is contained in:
Eric Freese 2020-01-25 07:47:23 -07:00
parent ae315ded4d
commit 7682c13860
2 changed files with 34 additions and 18 deletions

View file

@ -205,8 +205,21 @@ _zsh_autosuggest_partial_accept() {
} }
() { () {
typeset -ga _ZSH_AUTOSUGGEST_BUILTIN_ACTIONS
_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS=(
clear
fetch
suggest
accept
execute
enable
disable
toggle
)
local action local action
for action in clear modify fetch suggest accept partial_accept execute enable disable toggle; do for action in $_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS modify partial_accept; do
eval "_zsh_autosuggest_widget_$action() { eval "_zsh_autosuggest_widget_$action() {
local -i retval local -i retval
@ -223,12 +236,7 @@ _zsh_autosuggest_partial_accept() {
}" }"
done done
zle -N autosuggest-fetch _zsh_autosuggest_widget_fetch for action in $_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS; do
zle -N autosuggest-suggest _zsh_autosuggest_widget_suggest zle -N autosuggest-$action _zsh_autosuggest_widget_$action
zle -N autosuggest-accept _zsh_autosuggest_widget_accept done
zle -N autosuggest-clear _zsh_autosuggest_widget_clear
zle -N autosuggest-execute _zsh_autosuggest_widget_execute
zle -N autosuggest-enable _zsh_autosuggest_widget_enable
zle -N autosuggest-disable _zsh_autosuggest_widget_disable
zle -N autosuggest-toggle _zsh_autosuggest_widget_toggle
} }

View file

@ -467,8 +467,21 @@ _zsh_autosuggest_partial_accept() {
} }
() { () {
typeset -ga _ZSH_AUTOSUGGEST_BUILTIN_ACTIONS
_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS=(
clear
fetch
suggest
accept
execute
enable
disable
toggle
)
local action local action
for action in clear modify fetch suggest accept partial_accept execute enable disable toggle; do for action in $_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS modify partial_accept; do
eval "_zsh_autosuggest_widget_$action() { eval "_zsh_autosuggest_widget_$action() {
local -i retval local -i retval
@ -485,14 +498,9 @@ _zsh_autosuggest_partial_accept() {
}" }"
done done
zle -N autosuggest-fetch _zsh_autosuggest_widget_fetch for action in $_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS; do
zle -N autosuggest-suggest _zsh_autosuggest_widget_suggest zle -N autosuggest-$action _zsh_autosuggest_widget_$action
zle -N autosuggest-accept _zsh_autosuggest_widget_accept done
zle -N autosuggest-clear _zsh_autosuggest_widget_clear
zle -N autosuggest-execute _zsh_autosuggest_widget_execute
zle -N autosuggest-enable _zsh_autosuggest_widget_enable
zle -N autosuggest-disable _zsh_autosuggest_widget_disable
zle -N autosuggest-toggle _zsh_autosuggest_widget_toggle
} }
#--------------------------------------------------------------------# #--------------------------------------------------------------------#