|
|
@ -42,71 +42,93 @@ zmodload zsh/zpty |
|
|
|
# Color to use when highlighting suggestion |
|
|
|
# Uses format of `region_highlight` |
|
|
|
# More info: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Widgets |
|
|
|
: ${ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'} |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE} )) && |
|
|
|
typeset -g ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8' |
|
|
|
|
|
|
|
# Prefix to use when saving original versions of bound widgets |
|
|
|
: ${ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-} |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX} )) && |
|
|
|
typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig- |
|
|
|
|
|
|
|
# Strategies to use to fetch a suggestion |
|
|
|
# Will try each strategy in order until a suggestion is returned |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_STRATEGY} )) && ZSH_AUTOSUGGEST_STRATEGY=(history) |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_STRATEGY} )) && { |
|
|
|
typeset -ga ZSH_AUTOSUGGEST_STRATEGY |
|
|
|
ZSH_AUTOSUGGEST_STRATEGY=(history) |
|
|
|
} |
|
|
|
|
|
|
|
# Widgets that clear the suggestion |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_CLEAR_WIDGETS} )) && ZSH_AUTOSUGGEST_CLEAR_WIDGETS=( |
|
|
|
history-search-forward |
|
|
|
history-search-backward |
|
|
|
history-beginning-search-forward |
|
|
|
history-beginning-search-backward |
|
|
|
history-substring-search-up |
|
|
|
history-substring-search-down |
|
|
|
up-line-or-beginning-search |
|
|
|
down-line-or-beginning-search |
|
|
|
up-line-or-history |
|
|
|
down-line-or-history |
|
|
|
accept-line |
|
|
|
) |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_CLEAR_WIDGETS} )) && { |
|
|
|
typeset -ga ZSH_AUTOSUGGEST_CLEAR_WIDGETS |
|
|
|
ZSH_AUTOSUGGEST_CLEAR_WIDGETS=( |
|
|
|
history-search-forward |
|
|
|
history-search-backward |
|
|
|
history-beginning-search-forward |
|
|
|
history-beginning-search-backward |
|
|
|
history-substring-search-up |
|
|
|
history-substring-search-down |
|
|
|
up-line-or-beginning-search |
|
|
|
down-line-or-beginning-search |
|
|
|
up-line-or-history |
|
|
|
down-line-or-history |
|
|
|
accept-line |
|
|
|
) |
|
|
|
} |
|
|
|
|
|
|
|
# Widgets that accept the entire suggestion |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_ACCEPT_WIDGETS} )) && ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=( |
|
|
|
forward-char |
|
|
|
end-of-line |
|
|
|
vi-forward-char |
|
|
|
vi-end-of-line |
|
|
|
vi-add-eol |
|
|
|
) |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_ACCEPT_WIDGETS} )) && { |
|
|
|
typeset -ga ZSH_AUTOSUGGEST_ACCEPT_WIDGETS |
|
|
|
ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=( |
|
|
|
forward-char |
|
|
|
end-of-line |
|
|
|
vi-forward-char |
|
|
|
vi-end-of-line |
|
|
|
vi-add-eol |
|
|
|
) |
|
|
|
} |
|
|
|
|
|
|
|
# Widgets that accept the entire suggestion and execute it |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_EXECUTE_WIDGETS} )) && ZSH_AUTOSUGGEST_EXECUTE_WIDGETS=( |
|
|
|
) |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_EXECUTE_WIDGETS} )) && { |
|
|
|
typeset -ga ZSH_AUTOSUGGEST_EXECUTE_WIDGETS |
|
|
|
ZSH_AUTOSUGGEST_EXECUTE_WIDGETS=( |
|
|
|
) |
|
|
|
} |
|
|
|
|
|
|
|
# Widgets that accept the suggestion as far as the cursor moves |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS} )) && ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=( |
|
|
|
forward-word |
|
|
|
emacs-forward-word |
|
|
|
vi-forward-word |
|
|
|
vi-forward-word-end |
|
|
|
vi-forward-blank-word |
|
|
|
vi-forward-blank-word-end |
|
|
|
vi-find-next-char |
|
|
|
vi-find-next-char-skip |
|
|
|
) |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS} )) && { |
|
|
|
typeset -ga ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS |
|
|
|
ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=( |
|
|
|
forward-word |
|
|
|
emacs-forward-word |
|
|
|
vi-forward-word |
|
|
|
vi-forward-word-end |
|
|
|
vi-forward-blank-word |
|
|
|
vi-forward-blank-word-end |
|
|
|
vi-find-next-char |
|
|
|
vi-find-next-char-skip |
|
|
|
) |
|
|
|
} |
|
|
|
|
|
|
|
# Widgets that should be ignored (globbing supported but must be escaped) |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_IGNORE_WIDGETS} )) && ZSH_AUTOSUGGEST_IGNORE_WIDGETS=( |
|
|
|
orig-\* |
|
|
|
beep |
|
|
|
run-help |
|
|
|
set-local-history |
|
|
|
which-command |
|
|
|
yank |
|
|
|
yank-pop |
|
|
|
) |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_IGNORE_WIDGETS} )) && { |
|
|
|
typeset -ga ZSH_AUTOSUGGEST_IGNORE_WIDGETS |
|
|
|
ZSH_AUTOSUGGEST_IGNORE_WIDGETS=( |
|
|
|
orig-\* |
|
|
|
beep |
|
|
|
run-help |
|
|
|
set-local-history |
|
|
|
which-command |
|
|
|
yank |
|
|
|
yank-pop |
|
|
|
) |
|
|
|
} |
|
|
|
|
|
|
|
# Max size of buffer to trigger autosuggestion. Leave null for no upper bound. |
|
|
|
: ${ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=} |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE} )) && |
|
|
|
typeset -g ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE= |
|
|
|
|
|
|
|
# Pty name for calculating autosuggestions asynchronously |
|
|
|
: ${ZSH_AUTOSUGGEST_ASYNC_PTY_NAME=zsh_autosuggest_pty} |
|
|
|
(( ! ${+ZSH_AUTOSUGGEST_ASYNC_PTY_NAME} )) && |
|
|
|
typeset -g ZSH_AUTOSUGGEST_ASYNC_PTY_NAME=zsh_autosuggest_pty |
|
|
|
|
|
|
|
#--------------------------------------------------------------------# |
|
|
|
# Utility Functions # |
|
|
@ -143,21 +165,8 @@ _zsh_autosuggest_feature_detect_zpty_returns_fd() { |
|
|
|
#--------------------------------------------------------------------# |
|
|
|
|
|
|
|
_zsh_autosuggest_incr_bind_count() { |
|
|
|
if ((${+_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]})); then |
|
|
|
((_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]++)) |
|
|
|
else |
|
|
|
_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]=1 |
|
|
|
fi |
|
|
|
|
|
|
|
typeset -gi bind_count=$_ZSH_AUTOSUGGEST_BIND_COUNTS[$1] |
|
|
|
} |
|
|
|
|
|
|
|
_zsh_autosuggest_get_bind_count() { |
|
|
|
if ((${+_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]})); then |
|
|
|
typeset -gi bind_count=$_ZSH_AUTOSUGGEST_BIND_COUNTS[$1] |
|
|
|
else |
|
|
|
typeset -gi bind_count=0 |
|
|
|
fi |
|
|
|
typeset -gi bind_count=$((_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]+1)) |
|
|
|
_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]=$bind_count |
|
|
|
} |
|
|
|
|
|
|
|
# Bind a single widget to an autosuggest widget, saving a reference to the original widget |
|
|
@ -173,30 +182,30 @@ _zsh_autosuggest_bind_widget() { |
|
|
|
# Save a reference to the original widget |
|
|
|
case $widgets[$widget] in |
|
|
|
# Already bound |
|
|
|
user:_zsh_autosuggest_(bound|orig)_*);; |
|
|
|
user:_zsh_autosuggest_(bound|orig)_*) |
|
|
|
bind_count=$((_ZSH_AUTOSUGGEST_BIND_COUNTS[$widget])) |
|
|
|
;; |
|
|
|
|
|
|
|
# User-defined widget |
|
|
|
user:*) |
|
|
|
_zsh_autosuggest_incr_bind_count $widget |
|
|
|
zle -N $prefix${bind_count}-$widget ${widgets[$widget]#*:} |
|
|
|
zle -N $prefix$bind_count-$widget ${widgets[$widget]#*:} |
|
|
|
;; |
|
|
|
|
|
|
|
# Built-in widget |
|
|
|
builtin) |
|
|
|
_zsh_autosuggest_incr_bind_count $widget |
|
|
|
eval "_zsh_autosuggest_orig_${(q)widget}() { zle .${(q)widget} }" |
|
|
|
zle -N $prefix${bind_count}-$widget _zsh_autosuggest_orig_$widget |
|
|
|
zle -N $prefix$bind_count-$widget _zsh_autosuggest_orig_$widget |
|
|
|
;; |
|
|
|
|
|
|
|
# Completion widget |
|
|
|
completion:*) |
|
|
|
_zsh_autosuggest_incr_bind_count $widget |
|
|
|
eval "zle -C $prefix${bind_count}-${(q)widget} ${${(s.:.)widgets[$widget]}[2,3]}" |
|
|
|
eval "zle -C $prefix$bind_count-${(q)widget} ${${(s.:.)widgets[$widget]}[2,3]}" |
|
|
|
;; |
|
|
|
esac |
|
|
|
|
|
|
|
_zsh_autosuggest_get_bind_count $widget |
|
|
|
|
|
|
|
# Pass the original widget's name explicitly into the autosuggest |
|
|
|
# function. Use this passed in widget name to call the original |
|
|
|
# widget instead of relying on the $WIDGET variable being set |
|
|
@ -322,8 +331,6 @@ _zsh_autosuggest_clear() { |
|
|
|
|
|
|
|
# Modify the buffer and get a new suggestion |
|
|
|
_zsh_autosuggest_modify() { |
|
|
|
emulate -L zsh |
|
|
|
|
|
|
|
local -i retval |
|
|
|
|
|
|
|
# Only available in zsh >= 5.4 |
|
|
@ -340,6 +347,8 @@ _zsh_autosuggest_modify() { |
|
|
|
_zsh_autosuggest_invoke_original_widget $@ |
|
|
|
retval=$? |
|
|
|
|
|
|
|
emulate -L zsh |
|
|
|
|
|
|
|
# Don't fetch a new suggestion if there's more input to be read immediately |
|
|
|
if (( $PENDING > 0 )) || (( $KEYS_QUEUED_COUNT > 0 )); then |
|
|
|
POSTDISPLAY="$orig_postdisplay" |
|
|
@ -475,31 +484,34 @@ _zsh_autosuggest_partial_accept() { |
|
|
|
return $retval |
|
|
|
} |
|
|
|
|
|
|
|
for action in clear modify fetch suggest accept partial_accept execute enable disable toggle; do |
|
|
|
eval "_zsh_autosuggest_widget_$action() { |
|
|
|
local -i retval |
|
|
|
() { |
|
|
|
local action |
|
|
|
for action in clear modify fetch suggest accept partial_accept execute enable disable toggle; do |
|
|
|
eval "_zsh_autosuggest_widget_$action() { |
|
|
|
local -i retval |
|
|
|
|
|
|
|
_zsh_autosuggest_highlight_reset |
|
|
|
_zsh_autosuggest_highlight_reset |
|
|
|
|
|
|
|
_zsh_autosuggest_$action \$@ |
|
|
|
retval=\$? |
|
|
|
_zsh_autosuggest_$action \$@ |
|
|
|
retval=\$? |
|
|
|
|
|
|
|
_zsh_autosuggest_highlight_apply |
|
|
|
_zsh_autosuggest_highlight_apply |
|
|
|
|
|
|
|
zle -R |
|
|
|
zle -R |
|
|
|
|
|
|
|
return \$retval |
|
|
|
}" |
|
|
|
done |
|
|
|
return \$retval |
|
|
|
}" |
|
|
|
done |
|
|
|
|
|
|
|
zle -N autosuggest-fetch _zsh_autosuggest_widget_fetch |
|
|
|
zle -N autosuggest-suggest _zsh_autosuggest_widget_suggest |
|
|
|
zle -N autosuggest-accept _zsh_autosuggest_widget_accept |
|
|
|
zle -N autosuggest-clear _zsh_autosuggest_widget_clear |
|
|
|
zle -N autosuggest-execute _zsh_autosuggest_widget_execute |
|
|
|
zle -N autosuggest-enable _zsh_autosuggest_widget_enable |
|
|
|
zle -N autosuggest-disable _zsh_autosuggest_widget_disable |
|
|
|
zle -N autosuggest-toggle _zsh_autosuggest_widget_toggle |
|
|
|
zle -N autosuggest-fetch _zsh_autosuggest_widget_fetch |
|
|
|
zle -N autosuggest-suggest _zsh_autosuggest_widget_suggest |
|
|
|
zle -N autosuggest-accept _zsh_autosuggest_widget_accept |
|
|
|
zle -N autosuggest-clear _zsh_autosuggest_widget_clear |
|
|
|
zle -N autosuggest-execute _zsh_autosuggest_widget_execute |
|
|
|
zle -N autosuggest-enable _zsh_autosuggest_widget_enable |
|
|
|
zle -N autosuggest-disable _zsh_autosuggest_widget_disable |
|
|
|
zle -N autosuggest-toggle _zsh_autosuggest_widget_toggle |
|
|
|
} |
|
|
|
|
|
|
|
#--------------------------------------------------------------------# |
|
|
|
# History Suggestion Strategy # |
|
|
@ -595,6 +607,7 @@ _zsh_autosuggest_strategy_match_prev_cmd() { |
|
|
|
_zsh_autosuggest_fetch_suggestion() { |
|
|
|
typeset -g suggestion |
|
|
|
local -a strategies |
|
|
|
local strategy |
|
|
|
|
|
|
|
# Ensure we are working with an array |
|
|
|
strategies=(${=ZSH_AUTOSUGGEST_STRATEGY}) |
|
|
|