cleanup: Switch to guard clause in accept widget handler

Author: ericfreese

src/widgets.zsh

@@ -127,20 +127,23 @@ _zsh_autosuggest_accept() {
 		max_cursor_pos=$((max_cursor_pos - 1))
 	fi
 
+	if (( $CURSOR != $max_cursor_pos )); then
+		_zsh_autosuggest_invoke_original_widget $@
+		return
+	fi
+
 	# Only accept if the cursor is at the end of the buffer
-	if (( $CURSOR == $max_cursor_pos )); then
-		# Add the suggestion to the buffer
-		BUFFER="$BUFFER$POSTDISPLAY"
+	# Add the suggestion to the buffer
+	BUFFER="$BUFFER$POSTDISPLAY"
 
-		# Remove the suggestion
-		unset POSTDISPLAY
+	# Remove the suggestion
+	unset POSTDISPLAY
 
-		# Move the cursor to the end of the buffer
-		if [[ "$KEYMAP" = "vicmd" ]]; then
-			CURSOR=$(($#BUFFER - 1))
-		else
-			CURSOR=$#BUFFER
-		fi
+	# Move the cursor to the end of the buffer
+	if [[ "$KEYMAP" = "vicmd" ]]; then
+		CURSOR=$(($#BUFFER - 1))
+	else
+		CURSOR=$#BUFFER
 	fi
 
 	_zsh_autosuggest_invoke_original_widget $@

zsh-autosuggestions.zsh

@@ -389,20 +389,23 @@ _zsh_autosuggest_accept() {
 		max_cursor_pos=$((max_cursor_pos - 1))
 	fi
 
+	if (( $CURSOR != $max_cursor_pos )); then
+		_zsh_autosuggest_invoke_original_widget $@
+		return
+	fi
+
 	# Only accept if the cursor is at the end of the buffer
-	if (( $CURSOR == $max_cursor_pos )); then
-		# Add the suggestion to the buffer
-		BUFFER="$BUFFER$POSTDISPLAY"
+	# Add the suggestion to the buffer
+	BUFFER="$BUFFER$POSTDISPLAY"
 
-		# Remove the suggestion
-		unset POSTDISPLAY
+	# Remove the suggestion
+	unset POSTDISPLAY
 
-		# Move the cursor to the end of the buffer
-		if [[ "$KEYMAP" = "vicmd" ]]; then
-			CURSOR=$(($#BUFFER - 1))
-		else
-			CURSOR=$#BUFFER
-		fi
+	# Move the cursor to the end of the buffer
+	if [[ "$KEYMAP" = "vicmd" ]]; then
+		CURSOR=$(($#BUFFER - 1))
+	else
+		CURSOR=$#BUFFER
 	fi
 
 	_zsh_autosuggest_invoke_original_widget $@