Compare commits

...

2 Commits

Author SHA1 Message Date
Eric Freese
70517a6dfd Fix issues with LASTWIDGET caused by async suggestions
There are a number of widgets that rely on LASTWIDGET so that they can
chain their behavior together on subsequent invocations. When a
suggestion was fetched asynchronously, the widget showing the suggestion
would overwrite LASTWIDGET and break these widgets that rely on it.
Relatively recently, a flag was added to the `zle` builtin to opt out of
setting LASTWIDGET when calling a widget. We can use that flag to avoid
setting LASTWIDGET when displaying suggestions that were fetched
asynchronously.
2023-05-26 19:58:17 -06:00
Eric Freese
4e7ceb9f32 cleanup: Remove redundant autoload
We already autoload this in src/start.zsh
2023-05-26 19:58:17 -06:00
2 changed files with 24 additions and 4 deletions

View File

@ -44,7 +44,6 @@ _zsh_autosuggest_async_request() {
# There's a weird bug here where ^C stops working unless we force a fork
# See https://github.com/zsh-users/zsh-autosuggestions/issues/364
autoload -Uz is-at-least
is-at-least 5.8 || command true
# Read the pid from the child process
@ -65,7 +64,7 @@ _zsh_autosuggest_async_response() {
if [[ -z "$2" || "$2" == "hup" ]]; then
# Read everything from the fd and give it as a suggestion
IFS='' read -rd '' -u $1 suggestion
zle autosuggest-suggest -- "$suggestion"
_zsh_autosuggest_async_suggest "$suggestion"
# Close the fd
exec {1}<&-
@ -74,3 +73,14 @@ _zsh_autosuggest_async_response() {
# Always remove the handler
zle -F "$1"
}
_zsh_autosuggest_async_suggest() {
# Before 5.9, async suggestions break widgets that rely on LASTWIDGET
# such as copy-earlier-word and {up,down}-line-or-beginning-search. In
# 5.9, a flag was added to `zle` that will skip setting LASTWIDGET so
# that those widgets that depend on it will continue to work
# See https://www.zsh.org/mla/workers/2020/msg00824.html
local nolast
is-at-least 5.9 && nolast=supported
zle autosuggest-suggest ${=nolast:+-f nolast} -- "$1"
}

View File

@ -799,7 +799,6 @@ _zsh_autosuggest_async_request() {
# There's a weird bug here where ^C stops working unless we force a fork
# See https://github.com/zsh-users/zsh-autosuggestions/issues/364
autoload -Uz is-at-least
is-at-least 5.8 || command true
# Read the pid from the child process
@ -820,7 +819,7 @@ _zsh_autosuggest_async_response() {
if [[ -z "$2" || "$2" == "hup" ]]; then
# Read everything from the fd and give it as a suggestion
IFS='' read -rd '' -u $1 suggestion
zle autosuggest-suggest -- "$suggestion"
_zsh_autosuggest_async_suggest "$suggestion"
# Close the fd
exec {1}<&-
@ -830,6 +829,17 @@ _zsh_autosuggest_async_response() {
zle -F "$1"
}
_zsh_autosuggest_async_suggest() {
# Before 5.9, async suggestions break widgets that rely on LASTWIDGET
# such as copy-earlier-word and {up,down}-line-or-beginning-search. In
# 5.9, a flag was added to `zle` that will skip setting LASTWIDGET so
# that those widgets that depend on it will continue to work
# See https://www.zsh.org/mla/workers/2020/msg00824.html
local nolast
is-at-least 5.9 && nolast=supported
zle autosuggest-suggest ${=nolast:+-f nolast} -- "$1"
}
#--------------------------------------------------------------------#
# Start #
#--------------------------------------------------------------------#