linux/zsh-autosuggestions
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh-autosuggestions.git synced 2024-11-18 09:51:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bound widgets now handle arguments correctly

Browse source
This commit is contained in:
Eric Freese 2016-02-13 23:46:34 -07:00
parent 011f5420fc
commit 51b39e210e
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/bind.zsh
View file

@ -34,9 +34,9 @@ _zsh_autosuggest_bind_widget() {
# Set up widget to call $autosuggest_function if it exists # Set up widget to call $autosuggest_function if it exists
# Otherwise just call the original widget # Otherwise just call the original widget
if [ -n "$autosuggest_function" ]; then; if [ -n "$autosuggest_function" ]; then;
action=$autosuggest_function; action="$autosuggest_function \$@";
else; else;
action="zle $prefix$widget \$@" action="zle $prefix$widget -- \$@"
fi fi
# Create new function for the widget that highlights and calls the action # Create new function for the widget that highlights and calls the action
@ -72,9 +72,9 @@ _zsh_autosuggest_bind_widgets() {
# Given the name of a widget, invoke the original we saved, if it exists # Given the name of a widget, invoke the original we saved, if it exists
_zsh_autosuggest_invoke_original_widget() { _zsh_autosuggest_invoke_original_widget() {
local original_widget_name="$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX$1" local original_widget_name="$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX$WIDGET"
if [ $widgets[$original_widget_name] ]; then if [ $widgets[$original_widget_name] ]; then
zle $original_widget_name zle $original_widget_name -- $@
fi fi
} }

12
src/widgets.zsh
View file

@ -8,13 +8,13 @@ _zsh_autosuggest_clear() {
# Remove the suggestion # Remove the suggestion
unset POSTDISPLAY unset POSTDISPLAY
_zsh_autosuggest_invoke_original_widget $WIDGET _zsh_autosuggest_invoke_original_widget $@
} }
# Modify the buffer and get a new suggestion # Modify the buffer and get a new suggestion
_zsh_autosuggest_modify() { _zsh_autosuggest_modify() {
# Original widget modifies the buffer # Original widget modifies the buffer
_zsh_autosuggest_invoke_original_widget $WIDGET _zsh_autosuggest_invoke_original_widget $@
# Get a new suggestion if the buffer is not empty after modification # Get a new suggestion if the buffer is not empty after modification
local suggestion local suggestion
@ -44,7 +44,7 @@ _zsh_autosuggest_accept() {
CURSOR=${#BUFFER} CURSOR=${#BUFFER}
fi fi
_zsh_autosuggest_invoke_original_widget $WIDGET _zsh_autosuggest_invoke_original_widget $@
} }
# Partially accept the suggestion # Partially accept the suggestion
@ -56,7 +56,7 @@ _zsh_autosuggest_partial_accept() {
BUFFER="$BUFFER$POSTDISPLAY" BUFFER="$BUFFER$POSTDISPLAY"
# Original widget moves the cursor # Original widget moves the cursor
_zsh_autosuggest_invoke_original_widget $WIDGET _zsh_autosuggest_invoke_original_widget $@
# If we've moved past the end of the original buffer # If we've moved past the end of the original buffer
if [ $CURSOR -gt $#original_buffer ]; then if [ $CURSOR -gt $#original_buffer ]; then
@ -73,13 +73,13 @@ _zsh_autosuggest_partial_accept() {
_zsh_autosuggest_widget_accept() { _zsh_autosuggest_widget_accept() {
_zsh_autosuggest_highlight_reset _zsh_autosuggest_highlight_reset
_zsh_autosuggest_accept _zsh_autosuggest_accept $@
_zsh_autosuggest_highlight_apply _zsh_autosuggest_highlight_apply
} }
_zsh_autosuggest_widget_clear() { _zsh_autosuggest_widget_clear() {
_zsh_autosuggest_highlight_reset _zsh_autosuggest_highlight_reset
_zsh_autosuggest_clear _zsh_autosuggest_clear $@
_zsh_autosuggest_highlight_apply _zsh_autosuggest_highlight_apply
} }

20
zsh-autosuggestions.zsh
View file

@ -160,9 +160,9 @@ _zsh_autosuggest_bind_widget() {
# Set up widget to call $autosuggest_function if it exists # Set up widget to call $autosuggest_function if it exists
# Otherwise just call the original widget # Otherwise just call the original widget
if [ -n "$autosuggest_function" ]; then; if [ -n "$autosuggest_function" ]; then;
action=$autosuggest_function; action="$autosuggest_function \$@";
else; else;
action="zle $prefix$widget \$@" action="zle $prefix$widget -- \$@"
fi fi
# Create new function for the widget that highlights and calls the action # Create new function for the widget that highlights and calls the action
@ -198,10 +198,10 @@ _zsh_autosuggest_bind_widgets() {
# Given the name of a widget, invoke the original we saved, if it exists # Given the name of a widget, invoke the original we saved, if it exists
_zsh_autosuggest_invoke_original_widget() { _zsh_autosuggest_invoke_original_widget() {
local original_widget_name="$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX$1" local original_widget_name="$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX$WIDGET"
if [ $widgets[$original_widget_name] ]; then if [ $widgets[$original_widget_name] ]; then
zle $original_widget_name zle $original_widget_name -- $@
fi fi
} }
@ -236,13 +236,13 @@ _zsh_autosuggest_clear() {
# Remove the suggestion # Remove the suggestion
unset POSTDISPLAY unset POSTDISPLAY
_zsh_autosuggest_invoke_original_widget $WIDGET _zsh_autosuggest_invoke_original_widget $@
} }
# Modify the buffer and get a new suggestion # Modify the buffer and get a new suggestion
_zsh_autosuggest_modify() { _zsh_autosuggest_modify() {
# Original widget modifies the buffer # Original widget modifies the buffer
_zsh_autosuggest_invoke_original_widget $WIDGET _zsh_autosuggest_invoke_original_widget $@
# Get a new suggestion if the buffer is not empty after modification # Get a new suggestion if the buffer is not empty after modification
local suggestion local suggestion
@ -272,7 +272,7 @@ _zsh_autosuggest_accept() {
CURSOR=${#BUFFER} CURSOR=${#BUFFER}
fi fi
_zsh_autosuggest_invoke_original_widget $WIDGET _zsh_autosuggest_invoke_original_widget $@
} }
# Partially accept the suggestion # Partially accept the suggestion
@ -284,7 +284,7 @@ _zsh_autosuggest_partial_accept() {
BUFFER="$BUFFER$POSTDISPLAY" BUFFER="$BUFFER$POSTDISPLAY"
# Original widget moves the cursor # Original widget moves the cursor
_zsh_autosuggest_invoke_original_widget $WIDGET _zsh_autosuggest_invoke_original_widget $@
# If we've moved past the end of the original buffer # If we've moved past the end of the original buffer
if [ $CURSOR -gt $#original_buffer ]; then if [ $CURSOR -gt $#original_buffer ]; then
@ -301,13 +301,13 @@ _zsh_autosuggest_partial_accept() {
_zsh_autosuggest_widget_accept() { _zsh_autosuggest_widget_accept() {
_zsh_autosuggest_highlight_reset _zsh_autosuggest_highlight_reset
_zsh_autosuggest_accept _zsh_autosuggest_accept $@
_zsh_autosuggest_highlight_apply _zsh_autosuggest_highlight_apply
} }
_zsh_autosuggest_widget_clear() { _zsh_autosuggest_widget_clear() {
_zsh_autosuggest_highlight_reset _zsh_autosuggest_highlight_reset
_zsh_autosuggest_clear _zsh_autosuggest_clear $@
_zsh_autosuggest_highlight_apply _zsh_autosuggest_highlight_apply
} }