Merge 167d52e7d8 into c3d4e576c9

src/async.zsh

@@ -9,38 +9,31 @@ _zsh_autosuggest_async_request() {
 	typeset -g _ZSH_AUTOSUGGEST_ASYNC_FD _ZSH_AUTOSUGGEST_CHILD_PID
 
 	# 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
 
+	_ZSH_AUTOSUGGEST_ASYNC_FD=
+
+	{
 		# Fork a process to fetch a suggestion and open a pipe to read from it
 		exec {_ZSH_AUTOSUGGEST_ASYNC_FD}< <(
+			# Suppress error messages
+			exec 2>/dev/null
+
 			# Tell parent process our pid
-		echo $sysparams[pid]
+			if (( ${+sysparams} )); then
+				echo ${sysparams[pid]} || return
+			else
+				echo || return
+			fi
 
 			# Fetch and print the suggestion
 			local suggestion
 			_zsh_autosuggest_fetch_suggestion "$1"
-		echo -nE "$suggestion"
+			echo -nE - "$suggestion"
-	)
+		) || return
 
 		# There's a weird bug here where ^C stops working unless we force a fork
 		# See https://github.com/zsh-users/zsh-autosuggestions/issues/364
@@ -48,10 +41,27 @@ _zsh_autosuggest_async_request() {
 		is-at-least 5.8 || command true
 
 		# 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 || 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
@@ -61,16 +71,20 @@ _zsh_autosuggest_async_response() {
 	emulate -L zsh
 
 	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=
+		if [[ $# == 1 || $2 == "hup" ]]; then
+			# Read everything from the fd
 			IFS='' read -rd '' -u $1 suggestion
-		zle autosuggest-suggest -- "$suggestion"
+		fi
-
-		# Close the fd
-		exec {1}<&-
 	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
 }

zsh-autosuggestions.zsh

@@ -764,38 +764,31 @@ _zsh_autosuggest_async_request() {
 	typeset -g _ZSH_AUTOSUGGEST_ASYNC_FD _ZSH_AUTOSUGGEST_CHILD_PID
 
 	# 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
 
+	_ZSH_AUTOSUGGEST_ASYNC_FD=
+
+	{
 		# Fork a process to fetch a suggestion and open a pipe to read from it
 		exec {_ZSH_AUTOSUGGEST_ASYNC_FD}< <(
+			# Suppress error messages
+			exec 2>/dev/null
+
 			# Tell parent process our pid
-		echo $sysparams[pid]
+			if (( ${+sysparams} )); then
+				echo ${sysparams[pid]} || return
+			else
+				echo || return
+			fi
 
 			# Fetch and print the suggestion
 			local suggestion
 			_zsh_autosuggest_fetch_suggestion "$1"
-		echo -nE "$suggestion"
+			echo -nE - "$suggestion"
-	)
+		) || return
 
 		# There's a weird bug here where ^C stops working unless we force a fork
 		# See https://github.com/zsh-users/zsh-autosuggestions/issues/364
@@ -803,10 +796,27 @@ _zsh_autosuggest_async_request() {
 		is-at-least 5.8 || command true
 
 		# 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 || 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
@@ -816,18 +826,22 @@ _zsh_autosuggest_async_response() {
 	emulate -L zsh
 
 	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=
+		if [[ $# == 1 || $2 == "hup" ]]; then
+			# Read everything from the fd
 			IFS='' read -rd '' -u $1 suggestion
-		zle autosuggest-suggest -- "$suggestion"
+		fi
-
-		# Close the fd
-		exec {1}<&-
 	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
 }
 
 #--------------------------------------------------------------------#