RepoMirrors
/
zsh-autosuggestions
mirror of https://github.com/zsh-users/zsh-autosuggestions
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #501 from zsh-users/fixes/more-specific-widget-ignore 

Be more specific about the built-in widgets we want to avoid wrapping
This commit is contained in:
Eric Freese 2020-01-27 21:45:44 -07:00 committed by GitHub
parent ee18c7ce24 c114bd2298
commit e3897c25c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bind.zsh
View File

@ -69,7 +69,7 @@ _zsh_autosuggest_bind_widgets() {
ignore_widgets=( ignore_widgets=(
.\* .\*
_\* _\*
autosuggest-\* ${_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS/#/autosuggest-}
$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX\* $ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX\*
$ZSH_AUTOSUGGEST_IGNORE_WIDGETS $ZSH_AUTOSUGGEST_IGNORE_WIDGETS
) )

26
src/widgets.zsh
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
} }

28
zsh-autosuggestions.zsh
View File

@ -199,7 +199,7 @@ _zsh_autosuggest_bind_widgets() {
ignore_widgets=( ignore_widgets=(
.\* .\*
_\* _\*
autosuggest-\* ${_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS/#/autosuggest-}
$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX\* $ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX\*
$ZSH_AUTOSUGGEST_IGNORE_WIDGETS $ZSH_AUTOSUGGEST_IGNORE_WIDGETS
) )
@ -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
} }
#--------------------------------------------------------------------# #--------------------------------------------------------------------#