ylib/zsh-autosuggestions
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh-autosuggestions.git synced 2024-12-28 15:14:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Call original widget before moving cursor when accepting suggestion

Browse Source 
The check on length of `$POSTDISPLAY` is in support of the test for
`vi-delete` on the last char of the buffer with `dl`.

Fixes issue #482.
This commit is contained in:
Eric Freese 2019-12-15 06:56:10 -07:00
parent 54d7a9a84c
commit 6ec95379fa
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/widgets.zsh
View File

@ -119,7 +119,7 @@ _zsh_autosuggest_suggest() {
# Accept the entire suggestion # Accept the entire suggestion
_zsh_autosuggest_accept() { _zsh_autosuggest_accept() {
local -i max_cursor_pos=$#BUFFER local -i retval max_cursor_pos=$#BUFFER
# When vicmd keymap is active, the cursor can't move all the way # When vicmd keymap is active, the cursor can't move all the way
# to the end of the buffer # to the end of the buffer
@ -127,7 +127,9 @@ _zsh_autosuggest_accept() {
max_cursor_pos=$((max_cursor_pos - 1)) max_cursor_pos=$((max_cursor_pos - 1))
fi fi
if (( $CURSOR != $max_cursor_pos )); then # If we're not in a valid state to accept a suggestion, just run the
# original widget and bail out
if (( $CURSOR != $max_cursor_pos || !$#POSTDISPLAY )); then
_zsh_autosuggest_invoke_original_widget $@ _zsh_autosuggest_invoke_original_widget $@
return return
fi fi
@ -139,6 +141,11 @@ _zsh_autosuggest_accept() {
# Remove the suggestion # Remove the suggestion
unset POSTDISPLAY unset POSTDISPLAY
# Run the original widget before manually moving the cursor so that the
# cursor movement doesn't make the widget do something unexpected
_zsh_autosuggest_invoke_original_widget $@
retval=$?
# Move the cursor to the end of the buffer # Move the cursor to the end of the buffer
if [[ "$KEYMAP" = "vicmd" ]]; then if [[ "$KEYMAP" = "vicmd" ]]; then
CURSOR=$(($#BUFFER - 1)) CURSOR=$(($#BUFFER - 1))
@ -146,7 +153,7 @@ _zsh_autosuggest_accept() {
CURSOR=$#BUFFER CURSOR=$#BUFFER
fi fi
_zsh_autosuggest_invoke_original_widget $@ return $retval
} }
# Accept the entire suggestion and execute it # Accept the entire suggestion and execute it

13
zsh-autosuggestions.zsh
View File

@ -381,7 +381,7 @@ _zsh_autosuggest_suggest() {
# Accept the entire suggestion # Accept the entire suggestion
_zsh_autosuggest_accept() { _zsh_autosuggest_accept() {
local -i max_cursor_pos=$#BUFFER local -i retval max_cursor_pos=$#BUFFER
# When vicmd keymap is active, the cursor can't move all the way # When vicmd keymap is active, the cursor can't move all the way
# to the end of the buffer # to the end of the buffer
@ -389,7 +389,9 @@ _zsh_autosuggest_accept() {
max_cursor_pos=$((max_cursor_pos - 1)) max_cursor_pos=$((max_cursor_pos - 1))
fi fi
if (( $CURSOR != $max_cursor_pos )); then # If we're not in a valid state to accept a suggestion, just run the
# original widget and bail out
if (( $CURSOR != $max_cursor_pos || !$#POSTDISPLAY )); then
_zsh_autosuggest_invoke_original_widget $@ _zsh_autosuggest_invoke_original_widget $@
return return
fi fi
@ -401,6 +403,11 @@ _zsh_autosuggest_accept() {
# Remove the suggestion # Remove the suggestion
unset POSTDISPLAY unset POSTDISPLAY
# Run the original widget before manually moving the cursor so that the
# cursor movement doesn't make the widget do something unexpected
_zsh_autosuggest_invoke_original_widget $@
retval=$?
# Move the cursor to the end of the buffer # Move the cursor to the end of the buffer
if [[ "$KEYMAP" = "vicmd" ]]; then if [[ "$KEYMAP" = "vicmd" ]]; then
CURSOR=$(($#BUFFER - 1)) CURSOR=$(($#BUFFER - 1))
@ -408,7 +415,7 @@ _zsh_autosuggest_accept() {
CURSOR=$#BUFFER CURSOR=$#BUFFER
fi fi
_zsh_autosuggest_invoke_original_widget $@ return $retval
} }
# Accept the entire suggestion and execute it # Accept the entire suggestion and execute it