linux/zsh-autosuggestions
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh-autosuggestions.git synced 2024-12-02 10:01:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issues with LASTWIDGET caused by async suggestions

Browse source 
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.
This commit is contained in:
Eric Freese 2023-05-26 16:50:02 -06:00
parent 4e7ceb9f32
commit 70517a6dfd
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/async.zsh
View file

@ -64,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}<&-
@ -73,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"
}

13
zsh-autosuggestions.zsh
View file

@ -819,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}<&-
@ -829,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 #
#--------------------------------------------------------------------#