mirror of
https://github.com/zsh-users/zsh-autosuggestions.git
synced 2024-11-25 10:01:05 +01:00
Merge branch 'test-pr-551' into fix-yank-pop
Based on: https://github.com/zsh-users/zsh-autosuggestions/pull/551
This commit is contained in:
Aaron Culich
commit
50ad465c56
3 changed files with 82 additions and 8 deletions
|
|
@ -51,8 +51,16 @@ _zsh_autosuggest_bind_widget() {
|
|||
# correctly. $WIDGET cannot be trusted because other plugins call
|
||||
# zle without the `-w` flag (e.g. `zle self-insert` instead of
|
||||
# `zle self-insert -w`).
|
||||
# Preserve the ZLE_KILL | ZLE_YANK flags for builtin widgets for ZSH >= 5.2
|
||||
eval "_zsh_autosuggest_bound_${bind_count}_${(q)widget}() {
|
||||
_zsh_autosuggest_widget_$autosuggest_action $prefix$bind_count-${(q)widget} \$@
|
||||
if [[ ! "${ZSH_VERSION}" < 5.2 ]]; then
|
||||
case ${(q)widget} in
|
||||
(${(j:|:)ZSH_AUTOSUGGEST_ZLE_KILL_WIDGETS}) zle -f 'kill';;
|
||||
(${(j:|:)ZSH_AUTOSUGGEST_ZLE_YANK_WIDGETS}) zle -f 'yank';;
|
||||
(${(j:|:)ZSH_AUTOSUGGEST_ZLE_YANKBEFORE_WIDGETS}) zle -f 'yankbefore';;
|
||||
esac
|
||||
fi
|
||||
}"
|
||||
|
||||
# Create the bound widget
|
||||
|
|
|
|||
|
|
@ -84,12 +84,41 @@ typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-
|
|||
run-help
|
||||
set-local-history
|
||||
which-command
|
||||
yank
|
||||
yank-pop
|
||||
zle-\*
|
||||
)
|
||||
if [[ "${ZSH_VERSION}" < 5.2 ]]; then
|
||||
ZSH_AUTOSUGGEST_IGNORE_WIDGETS+=(yank)
|
||||
fi
|
||||
}
|
||||
|
||||
# Pty name for capturing completions for completion suggestion strategy
|
||||
(( ! ${+ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME} )) &&
|
||||
typeset -g ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME=zsh_autosuggest_completion_pty
|
||||
|
||||
# Widgets that should preserve ZLE_KILL flag
|
||||
(( ! ${+ZSH_AUTOSUGGEST_ZLE_KILL_WIDGETS} )) && {
|
||||
typeset -ga ZSH_AUTOSUGGEST_ZLE_KILL_WIDGETS
|
||||
ZSH_AUTOSUGGEST_ZLE_KILL_WIDGETS=(
|
||||
kill-\*
|
||||
backward-kill-\*
|
||||
)
|
||||
}
|
||||
|
||||
# Widgets that should preserve ZLE_YANK flag
|
||||
(( ! ${+ZSH_AUTOSUGGEST_ZLE_YANK_WIDGETS} )) && {
|
||||
typeset -ga ZSH_AUTOSUGGEST_ZLE_YANK_WIDGETS
|
||||
ZSH_AUTOSUGGEST_ZLE_YANK_WIDGETS=(
|
||||
bracketed-paste
|
||||
vi-put-after
|
||||
yank
|
||||
)
|
||||
}
|
||||
|
||||
# Widgets that should preserve ZLE_YANKBEFORE flag
|
||||
(( ! ${+ZSH_AUTOSUGGEST_ZLE_YANKBEFORE_WIDGETS} )) && {
|
||||
typeset -ga ZSH_AUTOSUGGEST_ZLE_YANKBEFORE_WIDGETS
|
||||
ZSH_AUTOSUGGEST_ZLE_YANKBEFORE_WIDGETS=(
|
||||
vi-put-before
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -110,16 +110,45 @@ typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-
|
|||
run-help
|
||||
set-local-history
|
||||
which-command
|
||||
yank
|
||||
yank-pop
|
||||
zle-\*
|
||||
)
|
||||
if [[ "${ZSH_VERSION}" < 5.2 ]]; then
|
||||
ZSH_AUTOSUGGEST_IGNORE_WIDGETS+=(yank)
|
||||
fi
|
||||
}
|
||||
|
||||
# Pty name for capturing completions for completion suggestion strategy
|
||||
(( ! ${+ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME} )) &&
|
||||
typeset -g ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME=zsh_autosuggest_completion_pty
|
||||
|
||||
# Widgets that should preserve ZLE_KILL flag
|
||||
(( ! ${+ZSH_AUTOSUGGEST_ZLE_KILL_WIDGETS} )) && {
|
||||
typeset -ga ZSH_AUTOSUGGEST_ZLE_KILL_WIDGETS
|
||||
ZSH_AUTOSUGGEST_ZLE_KILL_WIDGETS=(
|
||||
kill-\*
|
||||
backward-kill-\*
|
||||
)
|
||||
}
|
||||
|
||||
# Widgets that should preserve ZLE_YANK flag
|
||||
(( ! ${+ZSH_AUTOSUGGEST_ZLE_YANK_WIDGETS} )) && {
|
||||
typeset -ga ZSH_AUTOSUGGEST_ZLE_YANK_WIDGETS
|
||||
ZSH_AUTOSUGGEST_ZLE_YANK_WIDGETS=(
|
||||
bracketed-paste
|
||||
vi-put-after
|
||||
yank
|
||||
)
|
||||
}
|
||||
|
||||
# Widgets that should preserve ZLE_YANKBEFORE flag
|
||||
(( ! ${+ZSH_AUTOSUGGEST_ZLE_YANKBEFORE_WIDGETS} )) && {
|
||||
typeset -ga ZSH_AUTOSUGGEST_ZLE_YANKBEFORE_WIDGETS
|
||||
ZSH_AUTOSUGGEST_ZLE_YANKBEFORE_WIDGETS=(
|
||||
vi-put-before
|
||||
)
|
||||
}
|
||||
|
||||
#--------------------------------------------------------------------#
|
||||
# Utility Functions #
|
||||
#--------------------------------------------------------------------#
|
||||
|
|
@ -183,8 +212,16 @@ _zsh_autosuggest_bind_widget() {
|
|||
# correctly. $WIDGET cannot be trusted because other plugins call
|
||||
# zle without the `-w` flag (e.g. `zle self-insert` instead of
|
||||
# `zle self-insert -w`).
|
||||
# Preserve the ZLE_KILL | ZLE_YANK flags for builtin widgets for ZSH >= 5.2
|
||||
eval "_zsh_autosuggest_bound_${bind_count}_${(q)widget}() {
|
||||
_zsh_autosuggest_widget_$autosuggest_action $prefix$bind_count-${(q)widget} \$@
|
||||
if [[ ! "${ZSH_VERSION}" < 5.2 ]]; then
|
||||
case ${(q)widget} in
|
||||
(${(j:|:)ZSH_AUTOSUGGEST_ZLE_KILL_WIDGETS}) zle -f 'kill';;
|
||||
(${(j:|:)ZSH_AUTOSUGGEST_ZLE_YANK_WIDGETS}) zle -f 'yank';;
|
||||
(${(j:|:)ZSH_AUTOSUGGEST_ZLE_YANKBEFORE_WIDGETS}) zle -f 'yankbefore';;
|
||||
esac
|
||||
fi
|
||||
}"
|
||||
|
||||
# Create the bound widget
|
||||
|
|
@ -859,9 +896,9 @@ autoload -Uz add-zsh-hook is-at-least
|
|||
# older versions because there is a bug when using async mode where ^C does not
|
||||
# work immediately after fetching a suggestion.
|
||||
# See https://github.com/zsh-users/zsh-autosuggestions/issues/364
|
||||
if is-at-least 5.0.8; then
|
||||
typeset -g ZSH_AUTOSUGGEST_USE_ASYNC=
|
||||
fi
|
||||
# if is-at-least 5.0.8; then
|
||||
# typeset -g ZSH_AUTOSUGGEST_USE_ASYNC=
|
||||
# fi
|
||||
|
||||
# Start the autosuggestion widgets on the next precmd
|
||||
add-zsh-hook precmd _zsh_autosuggest_start
|
||||
|
|
|
|||
Loading…
Reference in a new issue