Use zle redraw hook if available (>= 5.4)

Set global parameters with typeset -g

spec/integrations/auto_cd_spec.rb

@@ -0,0 +1,14 @@
+describe 'with `AUTO_CD` option set' do
+  let(:after_sourcing) do
+    -> {
+      session.run_command('setopt AUTO_CD')
+      session.run_command('autoload compinit && compinit')
+    }
+  end
+
+  it 'directory names are still completed' do
+    session.send_string('sr')
+    session.send_keys('C-i')
+    wait_for { session.content }.to eq('src/')
+  end
+end

spec/integrations/glob_subst_spec.rb

@@ -0,0 +1,12 @@
+describe 'with `GLOB_SUBST` option set' do
+  let(:after_sourcing) do
+    -> {
+      session.run_command('setopt GLOB_SUBST')
+    }
+  end
+
+  it 'error messages are not printed' do
+    session.send_string('[[')
+    wait_for { session.content }.to eq('[[')
+  end
+end

spec/integrations/wrapped_widget_spec.rb

@@ -1,17 +1,25 @@
 describe 'a wrapped widget' do
   let(:widget) { 'backward-delete-char' }
 
-  context 'initialized before sourcing the plugin' do
+  let(:initialize_widget) do
-    let(:before_sourcing) do
     -> do
-        session.
+      session.run_command(<<~ZSH)
-          run_command("_orig_#{widget}() { zle .#{widget} }").
+        if [[ "$widgets[#{widget}]" == "builtin" ]]; then
-          run_command("zle -N orig-#{widget} _orig_#{widget}").
+          _orig_#{widget}() { zle .#{widget} }
-          run_command("#{widget}-magic() { zle orig-#{widget}; BUFFER+=b }").
+          zle -N orig-#{widget} _orig_#{widget}
-          run_command("zle -N #{widget} #{widget}-magic")
+        else
+          zle -N orig-#{widget} ${widgets[#{widget}]#*:}
+        fi
+
+        #{widget}-magic() { zle orig-#{widget}; BUFFER+=b }
+        zle -N #{widget} #{widget}-magic
+      ZSH
     end
   end
 
+  context 'initialized before sourcing the plugin' do
+    let(:before_sourcing) { initialize_widget }
+
     it 'executes the custom behavior and the built-in behavior' do
       with_history('foobar', 'foodar') do
         session.send_string('food').send_keys('C-h')
@@ -21,13 +29,7 @@ describe 'a wrapped widget' do
   end
 
   context 'initialized after sourcing the plugin' do
-    before do
+    let(:after_sourcing) { initialize_widget }
-      session.
-        run_command("zle -N orig-#{widget} ${widgets[#{widget}]#*:}").
-        run_command("#{widget}-magic() { zle orig-#{widget}; BUFFER+=b }").
-        run_command("zle -N #{widget} #{widget}-magic").
-        clear_screen
-    end
 
     it 'executes the custom behavior and the built-in behavior' do
       with_history('foobar', 'foodar') do

spec/integrations/zle_input_stack_spec.rb

@@ -9,8 +9,9 @@ describe 'using `zle -U`' do
 
   let(:options) { ['unset ZSH_AUTOSUGGEST_USE_ASYNC', 'ZSH_AUTOSUGGEST_STRATEGY=test'] }
 
-  # TODO: This is only possible with the $KEYS_QUEUED_COUNT widget parameter, coming soon...
+  it 'does not fetch a suggestion for every inserted character' do
-  xit 'does not fetch a suggestion for every inserted character' do
+    skip 'KEYS_QUEUED_COUNT not supported below v5.4.0' if session.zsh_version < Gem::Version.new('5.4.0')
+
     session.send_keys('C-b')
     wait_for { session.content }.to eq('echo hello')
   end

spec/options/widget_lists_spec.rb

@@ -41,12 +41,20 @@ describe 'a zle widget' do
     end
   end
 
+  context 'that accesses POSTDISPLAY' do
+    before { session.run_command("#{widget}() { zle -M \"POSTDISPLAY=$POSTDISPLAY\" }") }
+
     context 'when added to ZSH_AUTOSUGGEST_IGNORE_WIDGETS' do
       let(:options) { ["ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(#{widget})"] }
 
-    it 'should not be wrapped with an autosuggest widget' do
+      it 'gets the correct POSTDISPLAY value' do
-      session.run_command("echo $widgets[#{widget}]")
+        with_history('echo hello') do
-      wait_for { session.content }.to end_with("\nuser:#{widget}")
+          session.send_string('e')
+          wait_for { session.content }.to start_with('echo hello')
+          session.send_keys('C-b')
+          wait_for { session.content }.to end_with("\nPOSTDISPLAY=cho hello")
+        end
+      end
     end
   end
 

spec/strategies/history_spec.rb

@@ -1,6 +1,6 @@
 require 'strategies/special_characters_helper'
 
-describe 'the default suggestion strategy' do
+describe 'the `history` suggestion strategy' do
   it 'suggests the last matching history entry' do
     with_history('ls foo', 'ls bar', 'echo baz') do
       session.send_string('ls')

spec/strategies/match_prev_cmd_spec.rb

@@ -1,6 +1,6 @@
 require 'strategies/special_characters_helper'
 
-describe 'the match_prev_cmd strategy' do
+describe 'the `match_prev_cmd` strategy' do
   let(:options) { ['ZSH_AUTOSUGGEST_STRATEGY=match_prev_cmd'] }
 
   it 'suggests the last matching history entry after the previous command' do

src/bind.zsh

@@ -72,8 +72,28 @@ _zsh_autosuggest_bind_widget() {
 	zle -N -- $widget _zsh_autosuggest_bound_${bind_count}_$widget
 }
 
+_zsh_autosuggest_bind_autosuggest_widgets() {
+	local widget
+
+	for widget in $ZSH_AUTOSUGGEST_CLEAR_WIDGETS; do
+		_zsh_autosuggest_bind_widget $widget clear
+	done
+
+	for widget in $ZSH_AUTOSUGGEST_ACCEPT_WIDGETS; do
+		_zsh_autosuggest_bind_widget $widget accept
+	done
+
+	for widget in $ZSH_AUTOSUGGEST_EXECUTE_WIDGETS; do
+		_zsh_autosuggest_bind_widget $widget execute
+	done
+
+	for widget in $ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS; do
+		_zsh_autosuggest_bind_widget $widget partial_accept
+	done
+}
+
 # Map all configured widgets to the right autosuggest widgets
-_zsh_autosuggest_bind_widgets() {
+_zsh_autosuggest_bind_modify_widgets() {
 	emulate -L zsh
 
 	local widget
@@ -86,22 +106,15 @@ _zsh_autosuggest_bind_widgets() {
 		autosuggest-\*
 		$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX\*
 		$ZSH_AUTOSUGGEST_IGNORE_WIDGETS
+		$ZSH_AUTOSUGGEST_CLEAR_WIDGETS
+		$ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
+		$ZSH_AUTOSUGGEST_EXECUTE_WIDGETS
+		$ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS
 	)
 
-	# Find every widget we might want to bind and bind it appropriately
+	# Assume any widget omitted from the config arrays might modify the buffer
 	for widget in ${${(f)"$(builtin zle -la)"}:#${(j:|:)~ignore_widgets}}; do
-		if [[ -n ${ZSH_AUTOSUGGEST_CLEAR_WIDGETS[(r)$widget]} ]]; then
-			_zsh_autosuggest_bind_widget $widget clear
-		elif [[ -n ${ZSH_AUTOSUGGEST_ACCEPT_WIDGETS[(r)$widget]} ]]; then
-			_zsh_autosuggest_bind_widget $widget accept
-		elif [[ -n ${ZSH_AUTOSUGGEST_EXECUTE_WIDGETS[(r)$widget]} ]]; then
-			_zsh_autosuggest_bind_widget $widget execute
-		elif [[ -n ${ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS[(r)$widget]} ]]; then
-			_zsh_autosuggest_bind_widget $widget partial_accept
-		else
-			# Assume any unspecified widget might modify the buffer
 		_zsh_autosuggest_bind_widget $widget modify
-		fi
 	done
 }
 

src/config.zsh

@@ -6,17 +6,24 @@
 # Color to use when highlighting suggestion
 # Uses format of `region_highlight`
 # More info: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Widgets
-: ${ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'}
+(( ! ${+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE} )) &&
+typeset -g ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
 
 # Prefix to use when saving original versions of bound widgets
-: ${ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-}
+(( ! ${+ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX} )) &&
+typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-
 
 # Strategies to use to fetch a suggestion
 # Will try each strategy in order until a suggestion is returned
-(( ! ${+ZSH_AUTOSUGGEST_STRATEGY} )) && ZSH_AUTOSUGGEST_STRATEGY=(history)
+(( ! ${+ZSH_AUTOSUGGEST_STRATEGY} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_STRATEGY
+	ZSH_AUTOSUGGEST_STRATEGY=(history)
+}
 
 # Widgets that clear the suggestion
-(( ! ${+ZSH_AUTOSUGGEST_CLEAR_WIDGETS} )) && ZSH_AUTOSUGGEST_CLEAR_WIDGETS=(
+(( ! ${+ZSH_AUTOSUGGEST_CLEAR_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_CLEAR_WIDGETS
+	ZSH_AUTOSUGGEST_CLEAR_WIDGETS=(
 		history-search-forward
 		history-search-backward
 		history-beginning-search-forward
@@ -28,23 +35,32 @@
 		up-line-or-history
 		down-line-or-history
 		accept-line
-)
+	)
+}
 
 # Widgets that accept the entire suggestion
-(( ! ${+ZSH_AUTOSUGGEST_ACCEPT_WIDGETS} )) && ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(
+(( ! ${+ZSH_AUTOSUGGEST_ACCEPT_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
+	ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(
 		forward-char
 		end-of-line
 		vi-forward-char
 		vi-end-of-line
 		vi-add-eol
-)
+	)
+}
 
 # Widgets that accept the entire suggestion and execute it
-(( ! ${+ZSH_AUTOSUGGEST_EXECUTE_WIDGETS} )) && ZSH_AUTOSUGGEST_EXECUTE_WIDGETS=(
+(( ! ${+ZSH_AUTOSUGGEST_EXECUTE_WIDGETS} )) && {
-)
+	typeset -ga ZSH_AUTOSUGGEST_EXECUTE_WIDGETS
+	ZSH_AUTOSUGGEST_EXECUTE_WIDGETS=(
+	)
+}
 
 # Widgets that accept the suggestion as far as the cursor moves
-(( ! ${+ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS} )) && ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=(
+(( ! ${+ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS
+	ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=(
 		forward-word
 		emacs-forward-word
 		vi-forward-word
@@ -53,10 +69,14 @@
 		vi-forward-blank-word-end
 		vi-find-next-char
 		vi-find-next-char-skip
-)
+	)
+}
 
 # Widgets that should be ignored (globbing supported but must be escaped)
-(( ! ${+ZSH_AUTOSUGGEST_IGNORE_WIDGETS} )) && ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(
+# Only relevant for zsh versions older than 5.4
+(( ! ${+ZSH_AUTOSUGGEST_IGNORE_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_IGNORE_WIDGETS
+	ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(
 		orig-\*
 		beep
 		run-help
@@ -64,10 +84,13 @@
 		which-command
 		yank
 		yank-pop
-)
+	)
+}
 
 # Max size of buffer to trigger autosuggestion. Leave null for no upper bound.
-: ${ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=}
+(( ! ${+ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE} )) &&
+typeset -g ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=
 
 # Pty name for calculating autosuggestions asynchronously
-: ${ZSH_AUTOSUGGEST_ASYNC_PTY_NAME=zsh_autosuggest_pty}
+(( ! ${+ZSH_AUTOSUGGEST_ASYNC_PTY_NAME} )) &&
+typeset -g ZSH_AUTOSUGGEST_ASYNC_PTY_NAME=zsh_autosuggest_pty

src/fetch.zsh

@@ -9,6 +9,7 @@
 _zsh_autosuggest_fetch_suggestion() {
 	typeset -g suggestion
 	local -a strategies
+	local strategy
 
 	# Ensure we are working with an array
 	strategies=(${=ZSH_AUTOSUGGEST_STRATEGY})

src/setup.zsh

@@ -5,6 +5,8 @@
 
 # Precmd hooks for initializing the library and starting pty's
 autoload -Uz add-zsh-hook
+autoload -Uz add-zle-hook-widget
+autoload -Uz is-at-least
 
 # Asynchronous suggestions are generated in a pty
 zmodload zsh/zpty

src/start.zsh

@@ -7,13 +7,22 @@
 _zsh_autosuggest_start() {
 	add-zsh-hook -d precmd _zsh_autosuggest_start
 
-	_zsh_autosuggest_bind_widgets
-
 	# Re-bind widgets on every precmd to ensure we wrap other wrappers.
 	# Specifically, highlighting breaks if our widgets are wrapped by
 	# zsh-syntax-highlighting widgets. This also allows modifications
 	# to the widget list variables to take effect on the next precmd.
-	add-zsh-hook precmd _zsh_autosuggest_bind_widgets
+	_zsh_autosuggest_bind_autosuggest_widgets
+	add-zsh-hook precmd _zsh_autosuggest_bind_autosuggest_widgets
+
+	# If available, use a ZLE redraw hook to trigger fetching suggestions.
+	# Otherwise, we need to wrap all widgets and fetch suggestions after
+	# running them.
+	if is-at-least 5.4; then
+		add-zle-hook-widget line-pre-redraw autosuggest-redraw
+	else
+		_zsh_autosuggest_bind_modify_widgets
+		add-zsh-hook precmd _zsh_autosuggest_bind_modify_widgets
+	fi
 
 	if [[ -n "${ZSH_AUTOSUGGEST_USE_ASYNC+x}" ]]; then
 		_zsh_autosuggest_async_start

src/widgets.zsh

@@ -37,58 +37,23 @@ _zsh_autosuggest_clear() {
 
 # Modify the buffer and get a new suggestion
 _zsh_autosuggest_modify() {
-	emulate -L zsh
-
 	local -i retval
 
-	# Only available in zsh >= 5.4
+	# Save the contents of the postdisplay
-	local -i KEYS_QUEUED_COUNT
-
-	# Save the contents of the buffer/postdisplay
-	local orig_buffer="$BUFFER"
 	local orig_postdisplay="$POSTDISPLAY"
 
-	# Clear suggestion while waiting for next one
+	# Clear suggestion while original widget runs
 	unset POSTDISPLAY
 
 	# Original widget may modify the buffer
 	_zsh_autosuggest_invoke_original_widget $@
 	retval=$?
 
-	# Don't fetch a new suggestion if there's more input to be read immediately
+	# Restore postdisplay to be used in redraw
-	if (( $PENDING > 0 )) || (( $KEYS_QUEUED_COUNT > 0 )); then
 	POSTDISPLAY="$orig_postdisplay"
-		return $retval
-	fi
 
-	# Optimize if manually typing in the suggestion
+	# Run redraw to fetch a suggestion if needed
-	if (( $#BUFFER > $#orig_buffer )); then
+	_zsh_autosuggest_redraw
-		local added=${BUFFER#$orig_buffer}
-
-		# If the string added matches the beginning of the postdisplay
-		if [[ "$added" = "${orig_postdisplay:0:$#added}" ]]; then
-			POSTDISPLAY="${orig_postdisplay:$#added}"
-			return $retval
-		fi
-	fi
-
-	# Don't fetch a new suggestion if the buffer hasn't changed
-	if [[ "$BUFFER" = "$orig_buffer" ]]; then
-		POSTDISPLAY="$orig_postdisplay"
-		return $retval
-	fi
-
-	# Bail out if suggestions are disabled
-	if [[ -n "${_ZSH_AUTOSUGGEST_DISABLED+x}" ]]; then
-		return $?
-	fi
-
-	# Get a new suggestion if the buffer is not empty after modification
-	if (( $#BUFFER > 0 )); then
-		if [[ -z "$ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" ]] || (( $#BUFFER <= $ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE )); then
-			_zsh_autosuggest_fetch
-		fi
-	fi
 
 	return $retval
 }
@@ -190,7 +155,67 @@ _zsh_autosuggest_partial_accept() {
 	return $retval
 }
 
-for action in clear modify fetch suggest accept partial_accept execute enable disable toggle; do
+_zsh_autosuggest_redraw() {
+	emulate -L zsh
+
+	typeset -g _ZSH_AUTOSUGGEST_LAST_BUFFER
+
+	# Only available in zsh >= 5.4
+	local -i KEYS_QUEUED_COUNT
+
+	local orig_buffer="$_ZSH_AUTOSUGGEST_LAST_BUFFER"
+	local widget
+
+	# Store the current state of the buffer for next time
+	_ZSH_AUTOSUGGEST_LAST_BUFFER="$BUFFER"
+
+	# Buffer hasn't changed
+	[[ "$BUFFER" = "$orig_buffer" ]] && return 0
+
+	local ignore_widgets
+	ignore_widgets=(
+		$ZSH_AUTOSUGGEST_CLEAR_WIDGETS
+		$ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
+		$ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS
+		$ZSH_AUTOSUGGEST_IGNORE_WIDGETS
+	)
+
+	# Don't fetch a new suggestion after mapped widgets
+	for widget in $ignore_widgets; do
+		[[ "$LASTWIDGET" == "$widget" ]] && return 0
+	done
+
+	# Optimize if manually typing in the suggestion
+	if (( $#BUFFER > $#orig_buffer )); then
+		local added=${BUFFER#$orig_buffer}
+
+		# If the string added matches the beginning of the postdisplay
+		if [[ "$added" = "${POSTDISPLAY:0:$#added}" ]]; then
+			POSTDISPLAY="${POSTDISPLAY:$#added}"
+			return 0
+		fi
+	fi
+
+	unset POSTDISPLAY
+
+	# Don't fetch a new suggestion if there's more input to be read immediately
+	(( $PENDING > 0 )) || (( $KEYS_QUEUED_COUNT > 0 )) && return 0
+
+	# Buffer is empty
+	(( ! $#BUFFER )) && return 0
+
+	# Buffer longer than max size
+	[[ -n "$ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" ]] && (( $#BUFFER > $ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE )) && return 0
+
+	# Suggestions disabled
+	[[ -n "${_ZSH_AUTOSUGGEST_DISABLED+x}" ]] && return 0
+
+	_zsh_autosuggest_fetch
+}
+
+() {
+	local action
+	for action in clear modify fetch suggest accept partial_accept execute enable disable toggle redraw; do
 		eval "_zsh_autosuggest_widget_$action() {
 			local -i retval
 
@@ -205,13 +230,15 @@ for action in clear modify fetch suggest accept partial_accept execute enable di
 
 			return \$retval
 		}"
-done
+	done
 
-zle -N autosuggest-fetch _zsh_autosuggest_widget_fetch
+	zle -N autosuggest-redraw _zsh_autosuggest_widget_redraw
-zle -N autosuggest-suggest _zsh_autosuggest_widget_suggest
+	zle -N autosuggest-fetch _zsh_autosuggest_widget_fetch
-zle -N autosuggest-accept _zsh_autosuggest_widget_accept
+	zle -N autosuggest-suggest _zsh_autosuggest_widget_suggest
-zle -N autosuggest-clear _zsh_autosuggest_widget_clear
+	zle -N autosuggest-accept _zsh_autosuggest_widget_accept
-zle -N autosuggest-execute _zsh_autosuggest_widget_execute
+	zle -N autosuggest-clear _zsh_autosuggest_widget_clear
-zle -N autosuggest-enable _zsh_autosuggest_widget_enable
+	zle -N autosuggest-execute _zsh_autosuggest_widget_execute
-zle -N autosuggest-disable _zsh_autosuggest_widget_disable
+	zle -N autosuggest-enable _zsh_autosuggest_widget_enable
-zle -N autosuggest-toggle _zsh_autosuggest_widget_toggle
+	zle -N autosuggest-disable _zsh_autosuggest_widget_disable
+	zle -N autosuggest-toggle _zsh_autosuggest_widget_toggle
+}

zsh-autosuggestions.zsh

@@ -31,6 +31,8 @@
 
 # Precmd hooks for initializing the library and starting pty's
 autoload -Uz add-zsh-hook
+autoload -Uz add-zle-hook-widget
+autoload -Uz is-at-least
 
 # Asynchronous suggestions are generated in a pty
 zmodload zsh/zpty
@@ -42,17 +44,24 @@ zmodload zsh/zpty
 # Color to use when highlighting suggestion
 # Uses format of `region_highlight`
 # More info: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Widgets
-: ${ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'}
+(( ! ${+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE} )) &&
+typeset -g ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
 
 # Prefix to use when saving original versions of bound widgets
-: ${ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-}
+(( ! ${+ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX} )) &&
+typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-
 
 # Strategies to use to fetch a suggestion
 # Will try each strategy in order until a suggestion is returned
-(( ! ${+ZSH_AUTOSUGGEST_STRATEGY} )) && ZSH_AUTOSUGGEST_STRATEGY=(history)
+(( ! ${+ZSH_AUTOSUGGEST_STRATEGY} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_STRATEGY
+	ZSH_AUTOSUGGEST_STRATEGY=(history)
+}
 
 # Widgets that clear the suggestion
-(( ! ${+ZSH_AUTOSUGGEST_CLEAR_WIDGETS} )) && ZSH_AUTOSUGGEST_CLEAR_WIDGETS=(
+(( ! ${+ZSH_AUTOSUGGEST_CLEAR_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_CLEAR_WIDGETS
+	ZSH_AUTOSUGGEST_CLEAR_WIDGETS=(
 		history-search-forward
 		history-search-backward
 		history-beginning-search-forward
@@ -64,23 +73,32 @@ zmodload zsh/zpty
 		up-line-or-history
 		down-line-or-history
 		accept-line
-)
+	)
+}
 
 # Widgets that accept the entire suggestion
-(( ! ${+ZSH_AUTOSUGGEST_ACCEPT_WIDGETS} )) && ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(
+(( ! ${+ZSH_AUTOSUGGEST_ACCEPT_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
+	ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(
 		forward-char
 		end-of-line
 		vi-forward-char
 		vi-end-of-line
 		vi-add-eol
-)
+	)
+}
 
 # Widgets that accept the entire suggestion and execute it
-(( ! ${+ZSH_AUTOSUGGEST_EXECUTE_WIDGETS} )) && ZSH_AUTOSUGGEST_EXECUTE_WIDGETS=(
+(( ! ${+ZSH_AUTOSUGGEST_EXECUTE_WIDGETS} )) && {
-)
+	typeset -ga ZSH_AUTOSUGGEST_EXECUTE_WIDGETS
+	ZSH_AUTOSUGGEST_EXECUTE_WIDGETS=(
+	)
+}
 
 # Widgets that accept the suggestion as far as the cursor moves
-(( ! ${+ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS} )) && ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=(
+(( ! ${+ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS
+	ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=(
 		forward-word
 		emacs-forward-word
 		vi-forward-word
@@ -89,10 +107,14 @@ zmodload zsh/zpty
 		vi-forward-blank-word-end
 		vi-find-next-char
 		vi-find-next-char-skip
-)
+	)
+}
 
 # Widgets that should be ignored (globbing supported but must be escaped)
-(( ! ${+ZSH_AUTOSUGGEST_IGNORE_WIDGETS} )) && ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(
+# Only relevant for zsh versions older than 5.4
+(( ! ${+ZSH_AUTOSUGGEST_IGNORE_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_IGNORE_WIDGETS
+	ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(
 		orig-\*
 		beep
 		run-help
@@ -100,13 +122,16 @@ zmodload zsh/zpty
 		which-command
 		yank
 		yank-pop
-)
+	)
+}
 
 # Max size of buffer to trigger autosuggestion. Leave null for no upper bound.
-: ${ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=}
+(( ! ${+ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE} )) &&
+typeset -g ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=
 
 # Pty name for calculating autosuggestions asynchronously
-: ${ZSH_AUTOSUGGEST_ASYNC_PTY_NAME=zsh_autosuggest_pty}
+(( ! ${+ZSH_AUTOSUGGEST_ASYNC_PTY_NAME} )) &&
+typeset -g ZSH_AUTOSUGGEST_ASYNC_PTY_NAME=zsh_autosuggest_pty
 
 #--------------------------------------------------------------------#
 # Utility Functions                                                  #
@@ -211,8 +236,28 @@ _zsh_autosuggest_bind_widget() {
 	zle -N -- $widget _zsh_autosuggest_bound_${bind_count}_$widget
 }
 
+_zsh_autosuggest_bind_autosuggest_widgets() {
+	local widget
+
+	for widget in $ZSH_AUTOSUGGEST_CLEAR_WIDGETS; do
+		_zsh_autosuggest_bind_widget $widget clear
+	done
+
+	for widget in $ZSH_AUTOSUGGEST_ACCEPT_WIDGETS; do
+		_zsh_autosuggest_bind_widget $widget accept
+	done
+
+	for widget in $ZSH_AUTOSUGGEST_EXECUTE_WIDGETS; do
+		_zsh_autosuggest_bind_widget $widget execute
+	done
+
+	for widget in $ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS; do
+		_zsh_autosuggest_bind_widget $widget partial_accept
+	done
+}
+
 # Map all configured widgets to the right autosuggest widgets
-_zsh_autosuggest_bind_widgets() {
+_zsh_autosuggest_bind_modify_widgets() {
 	emulate -L zsh
 
 	local widget
@@ -225,22 +270,15 @@ _zsh_autosuggest_bind_widgets() {
 		autosuggest-\*
 		$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX\*
 		$ZSH_AUTOSUGGEST_IGNORE_WIDGETS
+		$ZSH_AUTOSUGGEST_CLEAR_WIDGETS
+		$ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
+		$ZSH_AUTOSUGGEST_EXECUTE_WIDGETS
+		$ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS
 	)
 
-	# Find every widget we might want to bind and bind it appropriately
+	# Assume any widget omitted from the config arrays might modify the buffer
 	for widget in ${${(f)"$(builtin zle -la)"}:#${(j:|:)~ignore_widgets}}; do
-		if [[ -n ${ZSH_AUTOSUGGEST_CLEAR_WIDGETS[(r)$widget]} ]]; then
-			_zsh_autosuggest_bind_widget $widget clear
-		elif [[ -n ${ZSH_AUTOSUGGEST_ACCEPT_WIDGETS[(r)$widget]} ]]; then
-			_zsh_autosuggest_bind_widget $widget accept
-		elif [[ -n ${ZSH_AUTOSUGGEST_EXECUTE_WIDGETS[(r)$widget]} ]]; then
-			_zsh_autosuggest_bind_widget $widget execute
-		elif [[ -n ${ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS[(r)$widget]} ]]; then
-			_zsh_autosuggest_bind_widget $widget partial_accept
-		else
-			# Assume any unspecified widget might modify the buffer
 		_zsh_autosuggest_bind_widget $widget modify
-		fi
 	done
 }
 
@@ -322,58 +360,23 @@ _zsh_autosuggest_clear() {
 
 # Modify the buffer and get a new suggestion
 _zsh_autosuggest_modify() {
-	emulate -L zsh
-
 	local -i retval
 
-	# Only available in zsh >= 5.4
+	# Save the contents of the postdisplay
-	local -i KEYS_QUEUED_COUNT
-
-	# Save the contents of the buffer/postdisplay
-	local orig_buffer="$BUFFER"
 	local orig_postdisplay="$POSTDISPLAY"
 
-	# Clear suggestion while waiting for next one
+	# Clear suggestion while original widget runs
 	unset POSTDISPLAY
 
 	# Original widget may modify the buffer
 	_zsh_autosuggest_invoke_original_widget $@
 	retval=$?
 
-	# Don't fetch a new suggestion if there's more input to be read immediately
+	# Restore postdisplay to be used in redraw
-	if (( $PENDING > 0 )) || (( $KEYS_QUEUED_COUNT > 0 )); then
 	POSTDISPLAY="$orig_postdisplay"
-		return $retval
-	fi
 
-	# Optimize if manually typing in the suggestion
+	# Run redraw to fetch a suggestion if needed
-	if (( $#BUFFER > $#orig_buffer )); then
+	_zsh_autosuggest_redraw
-		local added=${BUFFER#$orig_buffer}
-
-		# If the string added matches the beginning of the postdisplay
-		if [[ "$added" = "${orig_postdisplay:0:$#added}" ]]; then
-			POSTDISPLAY="${orig_postdisplay:$#added}"
-			return $retval
-		fi
-	fi
-
-	# Don't fetch a new suggestion if the buffer hasn't changed
-	if [[ "$BUFFER" = "$orig_buffer" ]]; then
-		POSTDISPLAY="$orig_postdisplay"
-		return $retval
-	fi
-
-	# Bail out if suggestions are disabled
-	if [[ -n "${_ZSH_AUTOSUGGEST_DISABLED+x}" ]]; then
-		return $?
-	fi
-
-	# Get a new suggestion if the buffer is not empty after modification
-	if (( $#BUFFER > 0 )); then
-		if [[ -z "$ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" ]] || (( $#BUFFER <= $ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE )); then
-			_zsh_autosuggest_fetch
-		fi
-	fi
 
 	return $retval
 }
@@ -475,7 +478,67 @@ _zsh_autosuggest_partial_accept() {
 	return $retval
 }
 
-for action in clear modify fetch suggest accept partial_accept execute enable disable toggle; do
+_zsh_autosuggest_redraw() {
+	emulate -L zsh
+
+	typeset -g _ZSH_AUTOSUGGEST_LAST_BUFFER
+
+	# Only available in zsh >= 5.4
+	local -i KEYS_QUEUED_COUNT
+
+	local orig_buffer="$_ZSH_AUTOSUGGEST_LAST_BUFFER"
+	local widget
+
+	# Store the current state of the buffer for next time
+	_ZSH_AUTOSUGGEST_LAST_BUFFER="$BUFFER"
+
+	# Buffer hasn't changed
+	[[ "$BUFFER" = "$orig_buffer" ]] && return 0
+
+	local ignore_widgets
+	ignore_widgets=(
+		$ZSH_AUTOSUGGEST_CLEAR_WIDGETS
+		$ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
+		$ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS
+		$ZSH_AUTOSUGGEST_IGNORE_WIDGETS
+	)
+
+	# Don't fetch a new suggestion after mapped widgets
+	for widget in $ignore_widgets; do
+		[[ "$LASTWIDGET" == "$widget" ]] && return 0
+	done
+
+	# Optimize if manually typing in the suggestion
+	if (( $#BUFFER > $#orig_buffer )); then
+		local added=${BUFFER#$orig_buffer}
+
+		# If the string added matches the beginning of the postdisplay
+		if [[ "$added" = "${POSTDISPLAY:0:$#added}" ]]; then
+			POSTDISPLAY="${POSTDISPLAY:$#added}"
+			return 0
+		fi
+	fi
+
+	unset POSTDISPLAY
+
+	# Don't fetch a new suggestion if there's more input to be read immediately
+	(( $PENDING > 0 )) || (( $KEYS_QUEUED_COUNT > 0 )) && return 0
+
+	# Buffer is empty
+	(( ! $#BUFFER )) && return 0
+
+	# Buffer longer than max size
+	[[ -n "$ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" ]] && (( $#BUFFER > $ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE )) && return 0
+
+	# Suggestions disabled
+	[[ -n "${_ZSH_AUTOSUGGEST_DISABLED+x}" ]] && return 0
+
+	_zsh_autosuggest_fetch
+}
+
+() {
+	local action
+	for action in clear modify fetch suggest accept partial_accept execute enable disable toggle redraw; do
 		eval "_zsh_autosuggest_widget_$action() {
 			local -i retval
 
@@ -490,16 +553,18 @@ for action in clear modify fetch suggest accept partial_accept execute enable di
 
 			return \$retval
 		}"
-done
+	done
 
-zle -N autosuggest-fetch _zsh_autosuggest_widget_fetch
+	zle -N autosuggest-redraw _zsh_autosuggest_widget_redraw
-zle -N autosuggest-suggest _zsh_autosuggest_widget_suggest
+	zle -N autosuggest-fetch _zsh_autosuggest_widget_fetch
-zle -N autosuggest-accept _zsh_autosuggest_widget_accept
+	zle -N autosuggest-suggest _zsh_autosuggest_widget_suggest
-zle -N autosuggest-clear _zsh_autosuggest_widget_clear
+	zle -N autosuggest-accept _zsh_autosuggest_widget_accept
-zle -N autosuggest-execute _zsh_autosuggest_widget_execute
+	zle -N autosuggest-clear _zsh_autosuggest_widget_clear
-zle -N autosuggest-enable _zsh_autosuggest_widget_enable
+	zle -N autosuggest-execute _zsh_autosuggest_widget_execute
-zle -N autosuggest-disable _zsh_autosuggest_widget_disable
+	zle -N autosuggest-enable _zsh_autosuggest_widget_enable
-zle -N autosuggest-toggle _zsh_autosuggest_widget_toggle
+	zle -N autosuggest-disable _zsh_autosuggest_widget_disable
+	zle -N autosuggest-toggle _zsh_autosuggest_widget_toggle
+}
 
 #--------------------------------------------------------------------#
 # History Suggestion Strategy                                        #
@@ -595,6 +660,7 @@ _zsh_autosuggest_strategy_match_prev_cmd() {
 _zsh_autosuggest_fetch_suggestion() {
 	typeset -g suggestion
 	local -a strategies
+	local strategy
 
 	# Ensure we are working with an array
 	strategies=(${=ZSH_AUTOSUGGEST_STRATEGY})
@@ -725,13 +791,22 @@ _zsh_autosuggest_async_start() {
 _zsh_autosuggest_start() {
 	add-zsh-hook -d precmd _zsh_autosuggest_start
 
-	_zsh_autosuggest_bind_widgets
-
 	# Re-bind widgets on every precmd to ensure we wrap other wrappers.
 	# Specifically, highlighting breaks if our widgets are wrapped by
 	# zsh-syntax-highlighting widgets. This also allows modifications
 	# to the widget list variables to take effect on the next precmd.
-	add-zsh-hook precmd _zsh_autosuggest_bind_widgets
+	_zsh_autosuggest_bind_autosuggest_widgets
+	add-zsh-hook precmd _zsh_autosuggest_bind_autosuggest_widgets
+
+	# If available, use a ZLE redraw hook to trigger fetching suggestions.
+	# Otherwise, we need to wrap all widgets and fetch suggestions after
+	# running them.
+	if is-at-least 5.4; then
+		add-zle-hook-widget line-pre-redraw autosuggest-redraw
+	else
+		_zsh_autosuggest_bind_modify_widgets
+		add-zsh-hook precmd _zsh_autosuggest_bind_modify_widgets
+	fi
 
 	if [[ -n "${ZSH_AUTOSUGGEST_USE_ASYNC+x}" ]]; then
 		_zsh_autosuggest_async_start