public/zsh-autosuggestions
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh-autosuggestions.git synced 2025-04-17 11:35:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 167d52e7d8 into c3d4e576c9

Browse Source
This commit is contained in:
Roman Perepelitsa 2023-09-07 09:31:49 -06:00 committed by GitHub
commit f9e88d4b13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 122 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/async.zsh
View File

@ -9,49 +9,59 @@ _zsh_autosuggest_async_request() {
typeset -g _ZSH_AUTOSUGGEST_ASYNC_FD _ZSH_AUTOSUGGEST_CHILD_PID typeset -g _ZSH_AUTOSUGGEST_ASYNC_FD _ZSH_AUTOSUGGEST_CHILD_PID
# If we've got a pending request, cancel it # If we've got a pending request, cancel it
if [[ -n "$_ZSH_AUTOSUGGEST_ASYNC_FD" ]] && { true <&$_ZSH_AUTOSUGGEST_ASYNC_FD } 2>/dev/null; then if (( _ZSH_AUTOSUGGEST_CHILD_PID )); then
# Close the file descriptor and remove the handler kill -TERM -- $_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}<&- _ZSH_AUTOSUGGEST_CHILD_PID=
zle -F $_ZSH_AUTOSUGGEST_ASYNC_FD
# We won't know the pid unless the user has zsh/system module installed
if [[ -n "$_ZSH_AUTOSUGGEST_CHILD_PID" ]]; then
# Zsh will make a new process group for the child process only if job
# control is enabled (MONITOR option)
if [[ -o MONITOR ]]; then
# Send the signal to the process group to kill any processes that may
# have been forked by the suggestion strategy
kill -TERM -$_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
else
# Kill just the child process since it wasn't placed in a new process
# group. If the suggestion strategy forked any child processes they may
# be orphaned and left behind.
kill -TERM $_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
fi
fi
fi fi
# Fork a process to fetch a suggestion and open a pipe to read from it _ZSH_AUTOSUGGEST_ASYNC_FD=
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}< <(
# Tell parent process our pid
echo $sysparams[pid]
# Fetch and print the suggestion {
local suggestion # Fork a process to fetch a suggestion and open a pipe to read from it
_zsh_autosuggest_fetch_suggestion "$1" exec {_ZSH_AUTOSUGGEST_ASYNC_FD}< <(
echo -nE "$suggestion" # Suppress error messages
) exec 2>/dev/null
# There's a weird bug here where ^C stops working unless we force a fork # Tell parent process our pid
# See https://github.com/zsh-users/zsh-autosuggestions/issues/364 if (( ${+sysparams} )); then
autoload -Uz is-at-least echo ${sysparams[pid]} || return
is-at-least 5.8 || command true else
echo || return
fi
# Read the pid from the child process # Fetch and print the suggestion
read _ZSH_AUTOSUGGEST_CHILD_PID <&$_ZSH_AUTOSUGGEST_ASYNC_FD local suggestion
_zsh_autosuggest_fetch_suggestion "$1"
echo -nE - "$suggestion"
) || return
# When the fd is readable, call the response handler # There's a weird bug here where ^C stops working unless we force a fork
zle -F "$_ZSH_AUTOSUGGEST_ASYNC_FD" _zsh_autosuggest_async_response # See https://github.com/zsh-users/zsh-autosuggestions/issues/364
autoload -Uz is-at-least
is-at-least 5.8 || command true
# Read the pid from the child process
read _ZSH_AUTOSUGGEST_CHILD_PID <&$_ZSH_AUTOSUGGEST_ASYNC_FD || return
# Zsh will make a new process group for the child process only if job
# control is enabled (MONITOR option)
if [[ -o MONITOR ]]; then
# If we need to kill the background process in the future, we'll send
# SIGTERM to the process group to kill any processes that may have
# been forked by the suggestion strategy
_ZSH_AUTOSUGGEST_CHILD_PID=-$_ZSH_AUTOSUGGEST_CHILD_PID
fi
# When the fd is readable, call the response handler
zle -F "$_ZSH_AUTOSUGGEST_ASYNC_FD" _zsh_autosuggest_async_response
} always {
# Clean things up if there was an error
if (( $? && _ZSH_AUTOSUGGEST_ASYNC_FD )); then
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}<&-
_ZSH_AUTOSUGGEST_ASYNC_FD=
_ZSH_AUTOSUGGEST_CHILD_PID=
fi
}
} }
# Called when new data is ready to be read from the pipe # Called when new data is ready to be read from the pipe
@ -61,16 +71,20 @@ _zsh_autosuggest_async_response() {
emulate -L zsh emulate -L zsh
local suggestion local suggestion
if (( $1 == _ZSH_AUTOSUGGEST_ASYNC_FD )); then
if [[ -z "$2" || "$2" == "hup" ]]; then _ZSH_AUTOSUGGEST_ASYNC_FD=
# Read everything from the fd and give it as a suggestion _ZSH_AUTOSUGGEST_CHILD_PID=
IFS='' read -rd '' -u $1 suggestion if [[ $# == 1 || $2 == "hup" ]]; then
zle autosuggest-suggest -- "$suggestion" # Read everything from the fd
IFS='' read -rd '' -u $1 suggestion
# Close the fd fi
exec {1}<&-
fi fi
# Always remove the handler # Always remove the handler and close the fd
zle -F "$1" zle -F $1
exec {1}<&-
if [[ -n $suggestion ]]; then
zle autosuggest-suggest -- "$suggestion"
fi
} }

108
zsh-autosuggestions.zsh
View File

@ -764,49 +764,59 @@ _zsh_autosuggest_async_request() {
typeset -g _ZSH_AUTOSUGGEST_ASYNC_FD _ZSH_AUTOSUGGEST_CHILD_PID typeset -g _ZSH_AUTOSUGGEST_ASYNC_FD _ZSH_AUTOSUGGEST_CHILD_PID
# If we've got a pending request, cancel it # If we've got a pending request, cancel it
if [[ -n "$_ZSH_AUTOSUGGEST_ASYNC_FD" ]] && { true <&$_ZSH_AUTOSUGGEST_ASYNC_FD } 2>/dev/null; then if (( _ZSH_AUTOSUGGEST_CHILD_PID )); then
# Close the file descriptor and remove the handler kill -TERM -- $_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}<&- _ZSH_AUTOSUGGEST_CHILD_PID=
zle -F $_ZSH_AUTOSUGGEST_ASYNC_FD
# We won't know the pid unless the user has zsh/system module installed
if [[ -n "$_ZSH_AUTOSUGGEST_CHILD_PID" ]]; then
# Zsh will make a new process group for the child process only if job
# control is enabled (MONITOR option)
if [[ -o MONITOR ]]; then
# Send the signal to the process group to kill any processes that may
# have been forked by the suggestion strategy
kill -TERM -$_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
else
# Kill just the child process since it wasn't placed in a new process
# group. If the suggestion strategy forked any child processes they may
# be orphaned and left behind.
kill -TERM $_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
fi
fi
fi fi
# Fork a process to fetch a suggestion and open a pipe to read from it _ZSH_AUTOSUGGEST_ASYNC_FD=
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}< <(
# Tell parent process our pid
echo $sysparams[pid]
# Fetch and print the suggestion {
local suggestion # Fork a process to fetch a suggestion and open a pipe to read from it
_zsh_autosuggest_fetch_suggestion "$1" exec {_ZSH_AUTOSUGGEST_ASYNC_FD}< <(
echo -nE "$suggestion" # Suppress error messages
) exec 2>/dev/null
# There's a weird bug here where ^C stops working unless we force a fork # Tell parent process our pid
# See https://github.com/zsh-users/zsh-autosuggestions/issues/364 if (( ${+sysparams} )); then
autoload -Uz is-at-least echo ${sysparams[pid]} || return
is-at-least 5.8 || command true else
echo || return
fi
# Read the pid from the child process # Fetch and print the suggestion
read _ZSH_AUTOSUGGEST_CHILD_PID <&$_ZSH_AUTOSUGGEST_ASYNC_FD local suggestion
_zsh_autosuggest_fetch_suggestion "$1"
echo -nE - "$suggestion"
) || return
# When the fd is readable, call the response handler # There's a weird bug here where ^C stops working unless we force a fork
zle -F "$_ZSH_AUTOSUGGEST_ASYNC_FD" _zsh_autosuggest_async_response # See https://github.com/zsh-users/zsh-autosuggestions/issues/364
autoload -Uz is-at-least
is-at-least 5.8 || command true
# Read the pid from the child process
read _ZSH_AUTOSUGGEST_CHILD_PID <&$_ZSH_AUTOSUGGEST_ASYNC_FD || return
# Zsh will make a new process group for the child process only if job
# control is enabled (MONITOR option)
if [[ -o MONITOR ]]; then
# If we need to kill the background process in the future, we'll send
# SIGTERM to the process group to kill any processes that may have
# been forked by the suggestion strategy
_ZSH_AUTOSUGGEST_CHILD_PID=-$_ZSH_AUTOSUGGEST_CHILD_PID
fi
# When the fd is readable, call the response handler
zle -F "$_ZSH_AUTOSUGGEST_ASYNC_FD" _zsh_autosuggest_async_response
} always {
# Clean things up if there was an error
if (( $? && _ZSH_AUTOSUGGEST_ASYNC_FD )); then
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}<&-
_ZSH_AUTOSUGGEST_ASYNC_FD=
_ZSH_AUTOSUGGEST_CHILD_PID=
fi
}
} }
# Called when new data is ready to be read from the pipe # Called when new data is ready to be read from the pipe
@ -816,18 +826,22 @@ _zsh_autosuggest_async_response() {
emulate -L zsh emulate -L zsh
local suggestion local suggestion
if (( $1 == _ZSH_AUTOSUGGEST_ASYNC_FD )); then
if [[ -z "$2" || "$2" == "hup" ]]; then _ZSH_AUTOSUGGEST_ASYNC_FD=
# Read everything from the fd and give it as a suggestion _ZSH_AUTOSUGGEST_CHILD_PID=
IFS='' read -rd '' -u $1 suggestion if [[ $# == 1 || $2 == "hup" ]]; then
zle autosuggest-suggest -- "$suggestion" # Read everything from the fd
IFS='' read -rd '' -u $1 suggestion
# Close the fd fi
exec {1}<&-
fi fi
# Always remove the handler # Always remove the handler and close the fd
zle -F "$1" zle -F $1
exec {1}<&-
if [[ -n $suggestion ]]; then
zle autosuggest-suggest -- "$suggestion"
fi
} }
#--------------------------------------------------------------------# #--------------------------------------------------------------------#