Compare commits
8 Commits
master
...
fixes/romk
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3391962a15 | ||
|
|
61257de667 | ||
|
|
84c7cfaa89 | ||
|
|
6259d46d36 | ||
|
|
b350b900ce | ||
|
|
e386de0247 | ||
|
|
2b730c9634 | ||
|
|
35ed23efe8 |
@ -15,31 +15,20 @@ _zsh_autosuggest_async_request() {
|
|||||||
zle -F $_ZSH_AUTOSUGGEST_ASYNC_FD
|
zle -F $_ZSH_AUTOSUGGEST_ASYNC_FD
|
||||||
|
|
||||||
# We won't know the pid unless the user has zsh/system module installed
|
# We won't know the pid unless the user has zsh/system module installed
|
||||||
if [[ -n "$_ZSH_AUTOSUGGEST_CHILD_PID" ]]; then
|
if (( _ZSH_AUTOSUGGEST_CHILD_PID )); then
|
||||||
# Zsh will make a new process group for the child process only if job
|
kill -TERM -- $_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
|
||||||
# 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
|
fi
|
||||||
|
|
||||||
# Fork a process to fetch a suggestion and open a pipe to read from it
|
# Fork a process to fetch a suggestion and open a pipe to read from it
|
||||||
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}< <(
|
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}< <(
|
||||||
# Tell parent process our pid
|
# Tell parent process our pid if we can
|
||||||
echo $sysparams[pid]
|
echo ${sysparams[pid]:-}
|
||||||
|
|
||||||
# Fetch and print the suggestion
|
# Fetch and print the suggestion
|
||||||
local suggestion
|
local suggestion
|
||||||
_zsh_autosuggest_fetch_suggestion "$1"
|
_zsh_autosuggest_fetch_suggestion "$1"
|
||||||
echo -nE "$suggestion"
|
echo -nE - "$suggestion"
|
||||||
)
|
)
|
||||||
|
|
||||||
# There's a weird bug here where ^C stops working unless we force a fork
|
# There's a weird bug here where ^C stops working unless we force a fork
|
||||||
@ -50,6 +39,15 @@ _zsh_autosuggest_async_request() {
|
|||||||
# Read the pid from the child process
|
# Read the pid from the child process
|
||||||
read _ZSH_AUTOSUGGEST_CHILD_PID <&$_ZSH_AUTOSUGGEST_ASYNC_FD
|
read _ZSH_AUTOSUGGEST_CHILD_PID <&$_ZSH_AUTOSUGGEST_ASYNC_FD
|
||||||
|
|
||||||
|
# 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:+-$_ZSH_AUTOSUGGEST_CHILD_PID}
|
||||||
|
fi
|
||||||
|
|
||||||
# When the fd is readable, call the response handler
|
# When the fd is readable, call the response handler
|
||||||
zle -F "$_ZSH_AUTOSUGGEST_ASYNC_FD" _zsh_autosuggest_async_response
|
zle -F "$_ZSH_AUTOSUGGEST_ASYNC_FD" _zsh_autosuggest_async_response
|
||||||
}
|
}
|
||||||
@ -60,17 +58,20 @@ _zsh_autosuggest_async_request() {
|
|||||||
_zsh_autosuggest_async_response() {
|
_zsh_autosuggest_async_response() {
|
||||||
emulate -L zsh
|
emulate -L zsh
|
||||||
|
|
||||||
|
typeset -g _ZSH_AUTOSUGGEST_ASYNC_FD _ZSH_AUTOSUGGEST_CHILD_PID
|
||||||
local suggestion
|
local suggestion
|
||||||
|
|
||||||
if [[ -z "$2" || "$2" == "hup" ]]; then
|
if [[ $# == 1 || "$2" == "hup" ]]; then
|
||||||
# Read everything from the fd and give it as a suggestion
|
# Read everything from the fd and give it as a suggestion
|
||||||
IFS='' read -rd '' -u $1 suggestion
|
IFS='' read -rd '' -u $1 suggestion
|
||||||
zle autosuggest-suggest -- "$suggestion"
|
zle autosuggest-suggest -- "$suggestion"
|
||||||
|
|
||||||
# Close the fd
|
# Close the fd
|
||||||
exec {1}<&-
|
exec {1}<&-
|
||||||
|
_ZSH_AUTOSUGGEST_ASYNC_FD=
|
||||||
|
_ZSH_AUTOSUGGEST_ASYNC_PID=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Always remove the handler
|
# Always remove the handler
|
||||||
zle -F "$1"
|
zle -F $1
|
||||||
}
|
}
|
||||||
|
|||||||
@ -770,31 +770,20 @@ _zsh_autosuggest_async_request() {
|
|||||||
zle -F $_ZSH_AUTOSUGGEST_ASYNC_FD
|
zle -F $_ZSH_AUTOSUGGEST_ASYNC_FD
|
||||||
|
|
||||||
# We won't know the pid unless the user has zsh/system module installed
|
# We won't know the pid unless the user has zsh/system module installed
|
||||||
if [[ -n "$_ZSH_AUTOSUGGEST_CHILD_PID" ]]; then
|
if (( _ZSH_AUTOSUGGEST_CHILD_PID )); then
|
||||||
# Zsh will make a new process group for the child process only if job
|
kill -TERM -- $_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
|
||||||
# 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
|
fi
|
||||||
|
|
||||||
# Fork a process to fetch a suggestion and open a pipe to read from it
|
# Fork a process to fetch a suggestion and open a pipe to read from it
|
||||||
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}< <(
|
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}< <(
|
||||||
# Tell parent process our pid
|
# Tell parent process our pid if we can
|
||||||
echo $sysparams[pid]
|
echo ${sysparams[pid]:-}
|
||||||
|
|
||||||
# Fetch and print the suggestion
|
# Fetch and print the suggestion
|
||||||
local suggestion
|
local suggestion
|
||||||
_zsh_autosuggest_fetch_suggestion "$1"
|
_zsh_autosuggest_fetch_suggestion "$1"
|
||||||
echo -nE "$suggestion"
|
echo -nE - "$suggestion"
|
||||||
)
|
)
|
||||||
|
|
||||||
# There's a weird bug here where ^C stops working unless we force a fork
|
# There's a weird bug here where ^C stops working unless we force a fork
|
||||||
@ -805,6 +794,15 @@ _zsh_autosuggest_async_request() {
|
|||||||
# Read the pid from the child process
|
# Read the pid from the child process
|
||||||
read _ZSH_AUTOSUGGEST_CHILD_PID <&$_ZSH_AUTOSUGGEST_ASYNC_FD
|
read _ZSH_AUTOSUGGEST_CHILD_PID <&$_ZSH_AUTOSUGGEST_ASYNC_FD
|
||||||
|
|
||||||
|
# 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:+-$_ZSH_AUTOSUGGEST_CHILD_PID}
|
||||||
|
fi
|
||||||
|
|
||||||
# When the fd is readable, call the response handler
|
# When the fd is readable, call the response handler
|
||||||
zle -F "$_ZSH_AUTOSUGGEST_ASYNC_FD" _zsh_autosuggest_async_response
|
zle -F "$_ZSH_AUTOSUGGEST_ASYNC_FD" _zsh_autosuggest_async_response
|
||||||
}
|
}
|
||||||
@ -815,19 +813,22 @@ _zsh_autosuggest_async_request() {
|
|||||||
_zsh_autosuggest_async_response() {
|
_zsh_autosuggest_async_response() {
|
||||||
emulate -L zsh
|
emulate -L zsh
|
||||||
|
|
||||||
|
typeset -g _ZSH_AUTOSUGGEST_ASYNC_FD _ZSH_AUTOSUGGEST_CHILD_PID
|
||||||
local suggestion
|
local suggestion
|
||||||
|
|
||||||
if [[ -z "$2" || "$2" == "hup" ]]; then
|
if [[ $# == 1 || "$2" == "hup" ]]; then
|
||||||
# Read everything from the fd and give it as a suggestion
|
# Read everything from the fd and give it as a suggestion
|
||||||
IFS='' read -rd '' -u $1 suggestion
|
IFS='' read -rd '' -u $1 suggestion
|
||||||
zle autosuggest-suggest -- "$suggestion"
|
zle autosuggest-suggest -- "$suggestion"
|
||||||
|
|
||||||
# Close the fd
|
# Close the fd
|
||||||
exec {1}<&-
|
exec {1}<&-
|
||||||
|
_ZSH_AUTOSUGGEST_ASYNC_FD=
|
||||||
|
_ZSH_AUTOSUGGEST_ASYNC_PID=
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Always remove the handler
|
# Always remove the handler
|
||||||
zle -F "$1"
|
zle -F $1
|
||||||
}
|
}
|
||||||
|
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user