cleanup: Switch to guard clause in accept widget handler

This commit is contained in:
Eric Freese 2019-12-15 06:55:14 -07:00
parent 5217ed5269
commit 54d7a9a84c
2 changed files with 28 additions and 22 deletions

View file

@ -127,8 +127,12 @@ _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
_zsh_autosuggest_invoke_original_widget $@
return
fi
# Only accept if the cursor is at the end of the buffer # Only accept if the cursor is at the end of the buffer
if (( $CURSOR == $max_cursor_pos )); then
# Add the suggestion to the buffer # Add the suggestion to the buffer
BUFFER="$BUFFER$POSTDISPLAY" BUFFER="$BUFFER$POSTDISPLAY"
@ -141,7 +145,6 @@ _zsh_autosuggest_accept() {
else else
CURSOR=$#BUFFER CURSOR=$#BUFFER
fi fi
fi
_zsh_autosuggest_invoke_original_widget $@ _zsh_autosuggest_invoke_original_widget $@
} }

View file

@ -389,8 +389,12 @@ _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
_zsh_autosuggest_invoke_original_widget $@
return
fi
# Only accept if the cursor is at the end of the buffer # Only accept if the cursor is at the end of the buffer
if (( $CURSOR == $max_cursor_pos )); then
# Add the suggestion to the buffer # Add the suggestion to the buffer
BUFFER="$BUFFER$POSTDISPLAY" BUFFER="$BUFFER$POSTDISPLAY"
@ -403,7 +407,6 @@ _zsh_autosuggest_accept() {
else else
CURSOR=$#BUFFER CURSOR=$#BUFFER
fi fi
fi
_zsh_autosuggest_invoke_original_widget $@ _zsh_autosuggest_invoke_original_widget $@
} }