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

Merge pull request #350 from zsh-users/features/improved-completion-suggestions

Browse source 
Improve completion suggestions
This commit is contained in:
Eric Freese 2018-07-02 12:28:39 -06:00 committed by GitHub
commit 106bf02d49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 130 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
src/strategies/completion.zsh
View file

@ -2,76 +2,61 @@
#--------------------------------------------------------------------# #--------------------------------------------------------------------#
# Completion Suggestion Strategy # # Completion Suggestion Strategy #
#--------------------------------------------------------------------# #--------------------------------------------------------------------#
# Fetches suggestions from zsh's completion engine # Fetches a suggestion from the completion engine
# Based on https://github.com/Valodim/zsh-capture-completion
# #
_zsh_autosuggest_capture_postcompletion() {
# Always insert the first completion into the buffer
compstate[insert]=1
# Don't list completions
unset compstate[list]
}
_zsh_autosuggest_capture_completion_widget() {
local -a +h comppostfuncs
comppostfuncs=(_zsh_autosuggest_capture_postcompletion)
# Only capture completions at the end of the buffer
CURSOR=$#BUFFER
# Run the original widget wrapping `.complete-word` so we don't
# recursively try to fetch suggestions, since our pty is forked
# after autosuggestions is initialized.
zle -- ${(k)widgets[(r)completion:.complete-word:_main_complete]}
# The completion has been added, print the buffer as the suggestion
echo -nE - $'\0'$BUFFER$'\0'
}
zle -N autosuggest-capture-completion _zsh_autosuggest_capture_completion_widget
_zsh_autosuggest_capture_setup() { _zsh_autosuggest_capture_setup() {
zmodload zsh/zutil # For `zparseopts` # There is a bug in zpty module in older zsh versions by which a
# Ensure completions have been initialized
if ! whence compdef >/dev/null; then
autoload -Uz compinit && compinit
fi
# There is a bug in zpty module (fixed in zsh/master) by which a
# zpty that exits will kill all zpty processes that were forked # zpty that exits will kill all zpty processes that were forked
# before it. Here we set up a zsh exit hook to SIGKILL the zpty # before it. Here we set up a zsh exit hook to SIGKILL the zpty
# process immediately, before it has a chance to kill any other # process immediately, before it has a chance to kill any other
# zpty processes. # zpty processes.
if ! is-at-least 5.4; then
zshexit() { zshexit() {
kill -KILL $$ kill -KILL $$
sleep 1 # Block for long enough for the signal to come through sleep 1 # Block for long enough for the signal to come through
} }
# Never group stuff!
zstyle ':completion:*' list-grouped false
# No list separator, this saves some stripping later on
zstyle ':completion:*' list-separator ''
# Override compadd (this is our hook)
compadd () {
setopt localoptions norcexpandparam
# Just delegate and leave if any of -O, -A or -D are given
if [[ ${@[1,(i)(-|--)]} == *-(O|A|D)\ * ]]; then
builtin compadd "$@"
return $?
fi fi
# Capture completions by injecting -A parameter into the compadd call. bindkey '^I' autosuggest-capture-completion
# This takes care of matching for us.
typeset -a __hits
builtin compadd -A __hits "$@"
# Exit if no completion results
[[ -n $__hits ]] || return
# Extract prefixes and suffixes from compadd call. we can't do zsh's cool
# -r remove-func magic, but it's better than nothing.
typeset -A apre hpre hsuf asuf
zparseopts -E P:=apre p:=hpre S:=asuf s:=hsuf
# Print the first match
echo -nE - $'\0'$IPREFIX$apre$hpre$__hits[1]$dsuf$hsuf$asuf$'\0'
}
} }
_zsh_autosuggest_capture_widget() { _zsh_autosuggest_capture_completion_sync() {
_zsh_autosuggest_capture_setup _zsh_autosuggest_capture_setup
zle complete-word zle autosuggest-capture-completion
} }
zle -N autosuggest-capture-completion _zsh_autosuggest_capture_widget _zsh_autosuggest_capture_completion_async() {
_zsh_autosuggest_capture_buffer() {
local BUFFERCONTENT="$1"
_zsh_autosuggest_capture_setup _zsh_autosuggest_capture_setup
zmodload zsh/parameter # For `$functions` zmodload zsh/parameter 2>/dev/null || return # For `$functions`
# Make vared completion work as if for a normal command line # Make vared completion work as if for a normal command line
# https://stackoverflow.com/a/7057118/154703 # https://stackoverflow.com/a/7057118/154703
@ -83,46 +68,37 @@ _zsh_autosuggest_capture_buffer() {
} }
# Open zle with buffer set so we can capture completions for it # Open zle with buffer set so we can capture completions for it
vared BUFFERCONTENT vared 1
} }
_zsh_autosuggest_capture_completion() { _zsh_autosuggest_strategy_completion() {
zmodload zsh/zpty 2>/dev/null || return typeset -g suggestion
typeset -g completion
local line REPLY local line REPLY
# Exit if we don't have completions
whence compdef >/dev/null || return
# Exit if we don't have zpty
zmodload zsh/zpty 2>/dev/null || return
# Zle will be inactive if we are in async mode # Zle will be inactive if we are in async mode
if zle; then if zle; then
zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME zle autosuggest-capture-completion zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME _zsh_autosuggest_capture_completion_sync
else else
zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME _zsh_autosuggest_capture_buffer "\$1" zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME _zsh_autosuggest_capture_completion_async "\$1"
zpty -w $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME $'\t' zpty -w $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME $'\t'
fi fi
{
# The completion result is surrounded by null bytes, so read the # The completion result is surrounded by null bytes, so read the
# content between the first two null bytes. # content between the first two null bytes.
zpty -r $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME line '*'$'\0''*'$'\0' zpty -r $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME line '*'$'\0''*'$'\0'
# On older versions of zsh, we sometimes get extra bytes after the # On older versions of zsh, we sometimes get extra bytes after the
# second null byte, so trim those off the end # second null byte, so trim those off the end
completion="${${${(M)line:#*$'\0'*$'\0'*}#*$'\0'}%%$'\0'*}" suggestion="${${${(M)line:#*$'\0'*$'\0'*}#*$'\0'}%%$'\0'*}"
} always {
# Destroy the pty # Destroy the pty
zpty -d $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME zpty -d $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME
} }
_zsh_autosuggest_strategy_completion() {
typeset -g suggestion
local completion
# Fetch the first completion result
_zsh_autosuggest_capture_completion "$1"
[[ -z "$completion" ]] && return
# Add the completion string to the buffer to build the full suggestion
local -i i=1
while [[ "$completion" != "${1[$i,-1]}"* ]]; do ((i++)); done
suggestion="${1[1,$i-1]}$completion"
} }

122
zsh-autosuggestions.zsh
View file

@ -472,76 +472,61 @@ zle -N autosuggest-toggle _zsh_autosuggest_widget_toggle
#--------------------------------------------------------------------# #--------------------------------------------------------------------#
# Completion Suggestion Strategy # # Completion Suggestion Strategy #
#--------------------------------------------------------------------# #--------------------------------------------------------------------#
# Fetches suggestions from zsh's completion engine # Fetches a suggestion from the completion engine
# Based on https://github.com/Valodim/zsh-capture-completion
# #
_zsh_autosuggest_capture_postcompletion() {
# Always insert the first completion into the buffer
compstate[insert]=1
# Don't list completions
unset compstate[list]
}
_zsh_autosuggest_capture_completion_widget() {
local -a +h comppostfuncs
comppostfuncs=(_zsh_autosuggest_capture_postcompletion)
# Only capture completions at the end of the buffer
CURSOR=$#BUFFER
# Run the original widget wrapping `.complete-word` so we don't
# recursively try to fetch suggestions, since our pty is forked
# after autosuggestions is initialized.
zle -- ${(k)widgets[(r)completion:.complete-word:_main_complete]}
# The completion has been added, print the buffer as the suggestion
echo -nE - $'\0'$BUFFER$'\0'
}
zle -N autosuggest-capture-completion _zsh_autosuggest_capture_completion_widget
_zsh_autosuggest_capture_setup() { _zsh_autosuggest_capture_setup() {
zmodload zsh/zutil # For `zparseopts` # There is a bug in zpty module in older zsh versions by which a
# Ensure completions have been initialized
if ! whence compdef >/dev/null; then
autoload -Uz compinit && compinit
fi
# There is a bug in zpty module (fixed in zsh/master) by which a
# zpty that exits will kill all zpty processes that were forked # zpty that exits will kill all zpty processes that were forked
# before it. Here we set up a zsh exit hook to SIGKILL the zpty # before it. Here we set up a zsh exit hook to SIGKILL the zpty
# process immediately, before it has a chance to kill any other # process immediately, before it has a chance to kill any other
# zpty processes. # zpty processes.
if ! is-at-least 5.4; then
zshexit() { zshexit() {
kill -KILL $$ kill -KILL $$
sleep 1 # Block for long enough for the signal to come through sleep 1 # Block for long enough for the signal to come through
} }
# Never group stuff!
zstyle ':completion:*' list-grouped false
# No list separator, this saves some stripping later on
zstyle ':completion:*' list-separator ''
# Override compadd (this is our hook)
compadd () {
setopt localoptions norcexpandparam
# Just delegate and leave if any of -O, -A or -D are given
if [[ ${@[1,(i)(-|--)]} == *-(O|A|D)\ * ]]; then
builtin compadd "$@"
return $?
fi fi
# Capture completions by injecting -A parameter into the compadd call. bindkey '^I' autosuggest-capture-completion
# This takes care of matching for us.
typeset -a __hits
builtin compadd -A __hits "$@"
# Exit if no completion results
[[ -n $__hits ]] || return
# Extract prefixes and suffixes from compadd call. we can't do zsh's cool
# -r remove-func magic, but it's better than nothing.
typeset -A apre hpre hsuf asuf
zparseopts -E P:=apre p:=hpre S:=asuf s:=hsuf
# Print the first match
echo -nE - $'\0'$IPREFIX$apre$hpre$__hits[1]$dsuf$hsuf$asuf$'\0'
}
} }
_zsh_autosuggest_capture_widget() { _zsh_autosuggest_capture_completion_sync() {
_zsh_autosuggest_capture_setup _zsh_autosuggest_capture_setup
zle complete-word zle autosuggest-capture-completion
} }
zle -N autosuggest-capture-completion _zsh_autosuggest_capture_widget _zsh_autosuggest_capture_completion_async() {
_zsh_autosuggest_capture_buffer() {
local BUFFERCONTENT="$1"
_zsh_autosuggest_capture_setup _zsh_autosuggest_capture_setup
zmodload zsh/parameter # For `$functions` zmodload zsh/parameter 2>/dev/null || return # For `$functions`
# Make vared completion work as if for a normal command line # Make vared completion work as if for a normal command line
# https://stackoverflow.com/a/7057118/154703 # https://stackoverflow.com/a/7057118/154703
@ -553,48 +538,39 @@ _zsh_autosuggest_capture_buffer() {
} }
# Open zle with buffer set so we can capture completions for it # Open zle with buffer set so we can capture completions for it
vared BUFFERCONTENT vared 1
} }
_zsh_autosuggest_capture_completion() { _zsh_autosuggest_strategy_completion() {
zmodload zsh/zpty 2>/dev/null || return typeset -g suggestion
typeset -g completion
local line REPLY local line REPLY
# Exit if we don't have completions
whence compdef >/dev/null || return
# Exit if we don't have zpty
zmodload zsh/zpty 2>/dev/null || return
# Zle will be inactive if we are in async mode # Zle will be inactive if we are in async mode
if zle; then if zle; then
zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME zle autosuggest-capture-completion zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME _zsh_autosuggest_capture_completion_sync
else else
zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME _zsh_autosuggest_capture_buffer "\$1" zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME _zsh_autosuggest_capture_completion_async "\$1"
zpty -w $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME $'\t' zpty -w $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME $'\t'
fi fi
{
# The completion result is surrounded by null bytes, so read the # The completion result is surrounded by null bytes, so read the
# content between the first two null bytes. # content between the first two null bytes.
zpty -r $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME line '*'$'\0''*'$'\0' zpty -r $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME line '*'$'\0''*'$'\0'
# On older versions of zsh, we sometimes get extra bytes after the # On older versions of zsh, we sometimes get extra bytes after the
# second null byte, so trim those off the end # second null byte, so trim those off the end
completion="${${${(M)line:#*$'\0'*$'\0'*}#*$'\0'}%%$'\0'*}" suggestion="${${${(M)line:#*$'\0'*$'\0'*}#*$'\0'}%%$'\0'*}"
} always {
# Destroy the pty # Destroy the pty
zpty -d $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME zpty -d $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME
} }
_zsh_autosuggest_strategy_completion() {
typeset -g suggestion
local completion
# Fetch the first completion result
_zsh_autosuggest_capture_completion "$1"
[[ -z "$completion" ]] && return
# Add the completion string to the buffer to build the full suggestion
local -i i=1
while [[ "$completion" != "${1[$i,-1]}"* ]]; do ((i++)); done
suggestion="${1[1,$i-1]}$completion"
} }
#--------------------------------------------------------------------# #--------------------------------------------------------------------#