RepoMirrors
/
zsh-autosuggestions
mirror of https://github.com/zsh-users/zsh-autosuggestions
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #447 from zsh-users/features/without-system-module 

Degrade gracefully on systems missing zsh/system module
This commit is contained in:
Eric Freese 2019-06-22 10:46:26 -06:00 committed by GitHub
parent 112dd3e3c7 a437544cc5
commit d27983b7ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/async.zsh
View File

@ -3,9 +3,9 @@
# Async # # Async #
#--------------------------------------------------------------------# #--------------------------------------------------------------------#
zmodload zsh/system
_zsh_autosuggest_async_request() { _zsh_autosuggest_async_request() {
zmodload zsh/system 2>/dev/null # For `$sysparams`
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
@ -14,17 +14,20 @@ _zsh_autosuggest_async_request() {
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}<&- exec {_ZSH_AUTOSUGGEST_ASYNC_FD}<&-
zle -F $_ZSH_AUTOSUGGEST_ASYNC_FD zle -F $_ZSH_AUTOSUGGEST_ASYNC_FD
# Zsh will make a new process group for the child process only if job # We won't know the pid unless the user has zsh/system module installed
# control is enabled (MONITOR option) if [[ -n "$_ZSH_AUTOSUGGEST_CHILD_PID" ]]; then
if [[ -o MONITOR ]]; then # Zsh will make a new process group for the child process only if job
# Send the signal to the process group to kill any processes that may # control is enabled (MONITOR option)
# have been forked by the suggestion strategy if [[ -o MONITOR ]]; then
kill -TERM -$_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null # Send the signal to the process group to kill any processes that may
else # have been forked by the suggestion strategy
# Kill just the child process since it wasn't placed in a new process kill -TERM -$_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
# group. If the suggestion strategy forked any child processes they may else
# be orphaned and left behind. # Kill just the child process since it wasn't placed in a new process
kill -TERM $_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null # 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

29
zsh-autosuggestions.zsh
View File

@ -726,9 +726,9 @@ _zsh_autosuggest_fetch_suggestion() {
# Async # # Async #
#--------------------------------------------------------------------# #--------------------------------------------------------------------#
zmodload zsh/system
_zsh_autosuggest_async_request() { _zsh_autosuggest_async_request() {
zmodload zsh/system 2>/dev/null # For `$sysparams`
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
@ -737,17 +737,20 @@ _zsh_autosuggest_async_request() {
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}<&- exec {_ZSH_AUTOSUGGEST_ASYNC_FD}<&-
zle -F $_ZSH_AUTOSUGGEST_ASYNC_FD zle -F $_ZSH_AUTOSUGGEST_ASYNC_FD
# Zsh will make a new process group for the child process only if job # We won't know the pid unless the user has zsh/system module installed
# control is enabled (MONITOR option) if [[ -n "$_ZSH_AUTOSUGGEST_CHILD_PID" ]]; then
if [[ -o MONITOR ]]; then # Zsh will make a new process group for the child process only if job
# Send the signal to the process group to kill any processes that may # control is enabled (MONITOR option)
# have been forked by the suggestion strategy if [[ -o MONITOR ]]; then
kill -TERM -$_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null # Send the signal to the process group to kill any processes that may
else # have been forked by the suggestion strategy
# Kill just the child process since it wasn't placed in a new process kill -TERM -$_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
# group. If the suggestion strategy forked any child processes they may else
# be orphaned and left behind. # Kill just the child process since it wasn't placed in a new process
kill -TERM $_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null # 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