Use zle redraw hook if available (>= 5.4)

Set global parameters with typeset -g

.circleci/config.yml

@@ -0,0 +1,16 @@
+version: 2
+jobs:
+  build:
+    parallelism: 4
+    shell: /bin/bash --login
+    docker:
+    - image: ericfreese/zsh-autosuggestions-test:latest
+      command: /sbin/init
+    steps:
+    - checkout
+    - run:
+        name: Running tests
+        command: |
+          for v in $(grep "^[^#]" ZSH_VERSIONS | awk "(NR + $CIRCLE_NODE_INDEX) % $CIRCLE_NODE_TOTAL == 0"); do
+            TEST_ZSH_BIN=zsh-$v make test || exit 1
+          done

.ruby-version

@@ -1 +1 @@
-2.3.1
+2.5.3

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v0.5.0
+- Don't overwrite config with default values (#335)
+- Support fallback strategies by supplying array to suggestion config var
+- Rename "default" suggestion strategy to "history" to name it based on what it actually does
+- Reset opts in some functions affected by `GLOB_SUBST` (#334)
+- Support widgets starting with dashes (ex: `-a-widget`) (#337)
+- Skip async tests in zsh versions less than 5.0.8 because of reliability issues
+- Fix handling of newline + carriage return in async pty (#333)
+
+
 ## v0.4.3
 - Avoid bell when accepting suggestions with `autosuggest-accept` (#228)
 - Don't fetch suggestions after [up,down]-line-or-beginning-search (#227, #241)

Dockerfile

@@ -0,0 +1,20 @@
+FROM ruby:2.5.3-alpine
+
+RUN apk add --no-cache autoconf
+RUN apk add --no-cache libtool
+RUN apk add --no-cache libcap-dev
+RUN apk add --no-cache pcre-dev
+RUN apk add --no-cache curl
+RUN apk add --no-cache build-base
+RUN apk add --no-cache ncurses-dev
+RUN apk add --no-cache tmux
+
+WORKDIR /zsh-autosuggestions
+
+ADD ZSH_VERSIONS /zsh-autosuggestions/ZSH_VERSIONS
+ADD install_test_zsh.sh /zsh-autosuggestions/install_test_zsh.sh
+RUN ./install_test_zsh.sh
+
+ADD Gemfile /zsh-autosuggestions/Gemfile
+ADD Gemfile.lock /zsh-autosuggestions/Gemfile.lock
+RUN bundle install

INSTALL.md

@@ -16,6 +16,16 @@
 
 3. Start a new terminal session.
 
+### Antigen
+
+1. Add the following to your `.zshrc`:
+
+    ```sh
+    antigen bundle zsh-users/zsh-autosuggestions
+    ```
+
+2. Start a new terminal session.
+
 ### Oh My Zsh
 
 1. Clone this repository into `$ZSH_CUSTOM/plugins` (by default `~/.oh-my-zsh/custom/plugins`)
@@ -24,7 +34,7 @@
     git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
     ```
 
-2. Add the plugin to the list of plugins for Oh My Zsh to load:
+2. Add the plugin to the list of plugins for Oh My Zsh to load (inside `~/.zshrc`):
 
     ```sh
     plugins=(zsh-autosuggestions)

Makefile

@@ -9,6 +9,7 @@ SRC_FILES := \
 	$(SRC_DIR)/highlight.zsh \
 	$(SRC_DIR)/widgets.zsh \
 	$(SRC_DIR)/strategies/*.zsh \
+	$(SRC_DIR)/fetch.zsh \
 	$(SRC_DIR)/async.zsh \
 	$(SRC_DIR)/start.zsh
 

README.md

@@ -27,7 +27,7 @@ If you invoke the `forward-word` widget, it will partially accept the suggestion
 
 ## Configuration
 
-You may want to override the default global config variables after sourcing the plugin. Default values of these variables can be found [here](src/config.zsh).
+You may want to override the default global config variables. Default values of these variables can be found [here](src/config.zsh).
 
 **Note:** If you are using Oh My Zsh, you can put this configuration in a file in the `$ZSH_CUSTOM` directory. See their comments on [overriding internals](https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals).
 
@@ -39,10 +39,10 @@ Set `ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE` to configure the style that the suggestion
 
 ### Suggestion Strategy
 
-Set `ZSH_AUTOSUGGEST_STRATEGY` to choose the strategy for generating suggestions. There are currently two to choose from:
+`ZSH_AUTOSUGGEST_STRATEGY` is an array that specifies how suggestions should be generated. The strategies in the array are tried successively until a suggestion is found. There are currently two built-in strategies to choose from:
 
-- `default`: Chooses the most recent match.
+- `history`: Chooses the most recent match from history.
-- `match_prev_cmd`: Chooses the most recent match whose preceding history item matches the most recently executed command ([more info](src/strategies/match_prev_cmd.zsh)). Note that this strategy won't work as expected with ZSH options that don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`.
+- `match_prev_cmd`: Like `history`, but chooses the most recent match whose preceding history item matches the most recently executed command ([more info](src/strategies/match_prev_cmd.zsh)). Note that this strategy won't work as expected with ZSH options that don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`.
 
 
 ### Widget Mapping
@@ -139,6 +139,20 @@ Tests are written in ruby using the [`rspec`](http://rspec.info/) framework. The
 
 Test files live in `spec/`. To run the tests, run `make test`. To run a specific test, run `TESTS=spec/some_spec.rb make test`. You can also specify a `zsh` binary to use by setting the `TEST_ZSH_BIN` environment variable (ex: `TEST_ZSH_BIN=/bin/zsh make test`).
 
+A docker image for testing is available [on docker hub](https://hub.docker.com/r/ericfreese/zsh-autosuggestions-test). It comes with ruby, the bundler dependencies, and all supported versions of zsh installed.
+
+Pull the docker image with:
+
+```sh
+docker pull ericfreese/zsh-autosuggestions-test
+```
+
+To run the tests for a specific version of zsh (where `<version>` below is substituted with the contents of a line from the [`ZSH_VERSIONS`](ZSH_VERSIONS) file):
+
+```sh
+docker run -it -e TEST_ZSH_BIN=zsh-<version> -v $PWD:/zsh-autosuggestions zsh-autosuggestions-test make test
+```
+
 
 ## License
 

VERSION

@@ -1 +1 @@
-v0.4.3
+v0.5.0

ZSH_VERSIONS

@@ -0,0 +1,15 @@
+# Zsh releases to run tests against
+# See https://github.com/zsh-users/zsh/releases
+#
+# When modifying this file, rebuild and push docker image:
+#   $ docker build -t ericfreese/zsh-autosuggestions-test .
+#   $ docker push ericfreese/zsh-autosuggestions-test
+4.3.11
+5.0.2
+5.0.8
+5.1.1
+5.2
+5.3.1
+5.4.2
+5.5.1
+5.6.2

circle.yml

@@ -1,12 +0,0 @@
-machine:
-  environment:
-    ZSH_VERSIONS: zsh-dev/4.3.11 zsh/5.0.2 zsh/5.0.8 zsh/5.1.1 zsh/5.2 zsh/5.3.1 zsh/5.4.2 zsh/5.5.1
-
-dependencies:
-  pre:
-    - for v in $(echo $ZSH_VERSIONS | awk "{ for (i=$((1+CIRCLE_NODE_INDEX));i<=NF;i+=$CIRCLE_NODE_TOTAL) print \$i }"); do wget https://sourceforge.net/projects/zsh/files/$v/zsh-${v#*/}.tar.gz && tar xzf zsh-${v#*/}.tar.gz && pushd zsh-${v#*/} && ./configure && sudo make install && popd || exit 1; done
-
-test:
-  override:
-    - for v in $(echo $ZSH_VERSIONS | awk "{ for (i=$((1+CIRCLE_NODE_INDEX));i<=NF;i+=$CIRCLE_NODE_TOTAL) print \$i }"); do TEST_ZSH_BIN=/usr/local/bin/zsh-${v#*/} make test || exit 1; done:
-        parallel: true

install_test_zsh.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -ex
+
+for v in $(grep "^[^#]" ZSH_VERSIONS); do
+  mkdir zsh-$v
+  cd zsh-$v
+
+  curl -L https://api.github.com/repos/zsh-users/zsh/tarball/zsh-$v | tar xz --strip=1
+
+  ./Util/preconfig
+  ./configure --enable-pcre \
+              --enable-cap \
+              --enable-multibyte \
+              --with-term-lib='ncursesw tinfo' \
+              --without-tcsetpgrp \
+              --program-suffix="-$v"
+
+  make install.bin
+  make install.modules
+  make install.fns
+
+  cd ..
+
+  rm -rf zsh-$v
+done

spec/async_spec.rb

@@ -1,4 +1,8 @@
 context 'with asynchronous suggestions enabled' do
+  before do
+    skip 'Async mode not supported below v5.0.8' if session.zsh_version < Gem::Version.new('5.0.8')
+  end
+
   let(:options) { ["ZSH_AUTOSUGGEST_USE_ASYNC="] }
 
   describe '`up-line-or-beginning-search`' do
@@ -27,6 +31,45 @@ context 'with asynchronous suggestions enabled' do
     end
   end
 
+  it 'should not add extra carriage returns before newlines' do
+    session.
+      send_string('echo "').
+      send_keys('escape').
+      send_keys('enter').
+      send_string('"').
+      send_keys('enter')
+
+    session.clear_screen
+
+    session.send_string('echo')
+    wait_for { session.content }.to eq("echo \"\n\"")
+  end
+
+  it 'should treat carriage returns and newlines as separate characters' do
+    session.
+      send_string('echo "').
+      send_keys('C-v').
+      send_keys('enter').
+      send_string('foo"').
+      send_keys('enter')
+
+    session.
+      send_string('echo "').
+      send_keys('control').
+      send_keys('enter').
+      send_string('bar"').
+      send_keys('enter')
+
+    session.clear_screen
+
+    session.
+      send_string('echo "').
+      send_keys('C-v').
+      send_keys('enter')
+
+    wait_for { session.content }.to eq('echo "^Mfoo"')
+  end
+
   describe 'exiting a subshell' do
     it 'should not cause error messages to be printed' do
       session.run_command('$(exit)')

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

@@ -2,15 +2,16 @@ describe 'using `zle -U`' do
   let(:before_sourcing) do
     -> do
       session.
-        run_command('_zsh_autosuggest_strategy_test() { sleep 1; _zsh_autosuggest_strategy_default "$1" }').
+        run_command('_zsh_autosuggest_strategy_test() { sleep 1; _zsh_autosuggest_strategy_history "$1" }').
         run_command('foo() { zle -U - "echo hello" }; zle -N foo; bindkey ^B foo')
     end
   end
 
   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/strategy_spec.rb

@@ -1,20 +1,55 @@
 describe 'a suggestion for a given prefix' do
-  let(:options) { ['_zsh_autosuggest_strategy_default() { suggestion="echo foo" }'] }
+  let(:history_strategy) { '_zsh_autosuggest_strategy_history() { suggestion="history" }' }
+  let(:foobar_strategy) { '_zsh_autosuggest_strategy_foobar() { [[ "foobar baz" = $1* ]] && suggestion="foobar baz" }' }
+  let(:foobaz_strategy) { '_zsh_autosuggest_strategy_foobaz() { [[ "foobaz bar" = $1* ]] && suggestion="foobaz bar" }' }
 
-  it 'is determined by calling the default strategy function' do
+  let(:after_sourcing) do
-    session.send_string('e')
+    -> do
-    wait_for { session.content }.to eq('echo foo')
+      session.run_command(history_strategy)
+    end
   end
 
-  context 'when ZSH_AUTOSUGGEST_STRATEGY is set' do
+  it 'by default is determined by calling the `history` strategy function' do
-    let(:options) { [
+    session.send_string('h')
-      '_zsh_autosuggest_strategy_custom() { suggestion="echo foo" }',
+    wait_for { session.content }.to eq('history')
-      'ZSH_AUTOSUGGEST_STRATEGY=custom'
+  end
-    ] }
 
-    it 'is determined by calling the specified strategy function' do
+  context 'when ZSH_AUTOSUGGEST_STRATEGY is set to an array' do
-      session.send_string('e')
+    let(:after_sourcing) do
-      wait_for { session.content }.to eq('echo foo')
+      -> do
+        session.
+          run_command(foobar_strategy).
+          run_command(foobaz_strategy).
+          run_command('ZSH_AUTOSUGGEST_STRATEGY=(foobar foobaz)')
+      end
+    end
+
+    it 'is determined by the first strategy function to return a suggestion' do
+      session.send_string('foo')
+      wait_for { session.content }.to eq('foobar baz')
+
+      session.send_string('baz')
+      wait_for { session.content }.to eq('foobaz bar')
+    end
+  end
+
+  context 'when ZSH_AUTOSUGGEST_STRATEGY is set to a string' do
+    let(:after_sourcing) do
+      -> do
+        session.
+          run_command(foobar_strategy).
+          run_command(foobaz_strategy).
+          run_command('ZSH_AUTOSUGGEST_STRATEGY="foobar foobaz"')
+      end
+    end
+
+    it 'is determined by the first strategy function to return a suggestion' do
+      session.send_string('foo')
+      wait_for { session.content }.to eq('foobar baz')
+
+      session.send_string('baz')
+      wait_for { session.content }.to eq('foobaz bar')
     end
   end
 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/spec_helper.rb

@@ -6,12 +6,14 @@ RSpec.shared_context 'terminal session' do
   let(:term_opts) { {} }
   let(:session) { TerminalSession.new(term_opts) }
   let(:before_sourcing) { -> {} }
+  let(:after_sourcing) { -> {} }
   let(:options) { [] }
 
   around do |example|
     before_sourcing.call
-
+    session.run_command(options.join('; '))
-    session.run_command((['source zsh-autosuggestions.zsh'] + options).join('; '))
+    session.run_command('source zsh-autosuggestions.zsh')
+    after_sourcing.call
     session.clear_screen
 
     example.run

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

spec/terminal_session.rb

@@ -18,6 +18,10 @@ class TerminalSession
     tmux_command("new-session -d -x #{opts[:width]} -y #{opts[:height]} '#{cmd}'")
   end
 
+  def zsh_version
+    @zsh_version ||= Gem::Version.new(`#{ZSH_BIN} -c 'echo -n $ZSH_VERSION'`)
+  end
+
   def tmux_socket_name
     @tmux_socket_name ||= SecureRandom.hex(6)
   end

src/async.zsh

@@ -17,9 +17,12 @@ _zsh_autosuggest_async_server() {
 		sleep 1 # Block for long enough for the signal to come through
 	}
 
-	# Output only newlines (not carriage return + newline)
+	# Don't add any extra carriage returns
 	stty -onlcr
 
+	# Don't translate carriage returns to newlines
+	stty -icrnl
+
 	# Silence any error messages
 	exec 2>/dev/null
 
@@ -32,7 +35,7 @@ _zsh_autosuggest_async_server() {
 		# Run suggestion search in the background
 		(
 			local suggestion
-			_zsh_autosuggest_strategy_$ZSH_AUTOSUGGEST_STRATEGY "$query"
+			_zsh_autosuggest_fetch_suggestion "$query"
 			echo -n -E "$suggestion"$'\0'
 		) &
 

src/bind.zsh

@@ -69,11 +69,33 @@ _zsh_autosuggest_bind_widget() {
 	}"
 
 	# Create the bound widget
-	zle -N $widget _zsh_autosuggest_bound_${bind_count}_$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
 	local ignore_widgets
 
@@ -84,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,14 +6,23 @@
 # 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-
 
-ZSH_AUTOSUGGEST_STRATEGY=default
+# Strategies to use to fetch a suggestion
+# Will try each strategy in order until a suggestion is returned
+(( ! ${+ZSH_AUTOSUGGEST_STRATEGY} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_STRATEGY
+	ZSH_AUTOSUGGEST_STRATEGY=(history)
+}
 
 # Widgets that clear the suggestion
+(( ! ${+ZSH_AUTOSUGGEST_CLEAR_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_CLEAR_WIDGETS
 	ZSH_AUTOSUGGEST_CLEAR_WIDGETS=(
 		history-search-forward
 		history-search-backward
@@ -27,8 +36,11 @@ ZSH_AUTOSUGGEST_CLEAR_WIDGETS=(
 		down-line-or-history
 		accept-line
 	)
+}
 
 # Widgets that accept the entire suggestion
+(( ! ${+ZSH_AUTOSUGGEST_ACCEPT_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
 	ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(
 		forward-char
 		end-of-line
@@ -36,12 +48,18 @@ ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(
 		vi-end-of-line
 		vi-add-eol
 	)
+}
 
 # Widgets that accept the entire suggestion and execute it
+(( ! ${+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} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS
 	ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=(
 		forward-word
 		emacs-forward-word
@@ -52,8 +70,12 @@ ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=(
 		vi-find-next-char
 		vi-find-next-char-skip
 	)
+}
 
 # Widgets that should be ignored (globbing supported but must be escaped)
+# 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
@@ -63,9 +85,12 @@ ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(
 		yank
 		yank-pop
 	)
+}
 
-# Max size of buffer to trigger autosuggestion. Leave undefined for no upper bound.
+# 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

@@ -0,0 +1,24 @@
+
+#--------------------------------------------------------------------#
+# Fetch Suggestion                                                   #
+#--------------------------------------------------------------------#
+# Loops through all specified strategies and returns a suggestion
+# from the first strategy to provide one.
+#
+
+_zsh_autosuggest_fetch_suggestion() {
+	typeset -g suggestion
+	local -a strategies
+	local strategy
+
+	# Ensure we are working with an array
+	strategies=(${=ZSH_AUTOSUGGEST_STRATEGY})
+
+	for strategy in $strategies; do
+		# Try to get a suggestion from this strategy
+		_zsh_autosuggest_strategy_$strategy "$1"
+
+		# Break once we've found a suggestion
+		[[ -n "$suggestion" ]] && break
+	done
+}

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/strategies/history.zsh

@@ -1,12 +1,12 @@
 
 #--------------------------------------------------------------------#
-# Default Suggestion Strategy                                        #
+# History Suggestion Strategy                                        #
 #--------------------------------------------------------------------#
 # Suggests the most recent history item that matches the given
 # prefix.
 #
 
-_zsh_autosuggest_strategy_default() {
+_zsh_autosuggest_strategy_history() {
 	# Reset options to defaults and enable LOCAL_OPTIONS
 	emulate -L zsh
 

src/widgets.zsh

@@ -39,54 +39,21 @@ _zsh_autosuggest_clear() {
 _zsh_autosuggest_modify() {
 	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
 }
@@ -97,13 +64,15 @@ _zsh_autosuggest_fetch() {
 		_zsh_autosuggest_async_request "$BUFFER"
 	else
 		local suggestion
-		_zsh_autosuggest_strategy_$ZSH_AUTOSUGGEST_STRATEGY "$BUFFER"
+		_zsh_autosuggest_fetch_suggestion "$BUFFER"
 		_zsh_autosuggest_suggest "$suggestion"
 	fi
 }
 
 # Offer a suggestion
 _zsh_autosuggest_suggest() {
+	emulate -L zsh
+
 	local suggestion="$1"
 
 	if [[ -n "$suggestion" ]] && (( $#BUFFER )); then
@@ -186,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
 
@@ -203,6 +232,7 @@ for action in clear modify fetch suggest accept partial_accept execute enable di
 		}"
 	done
 
+	zle -N autosuggest-redraw _zsh_autosuggest_widget_redraw
 	zle -N autosuggest-fetch _zsh_autosuggest_widget_fetch
 	zle -N autosuggest-suggest _zsh_autosuggest_widget_suggest
 	zle -N autosuggest-accept _zsh_autosuggest_widget_accept
@@ -211,3 +241,4 @@ zle -N autosuggest-execute _zsh_autosuggest_widget_execute
 	zle -N autosuggest-enable _zsh_autosuggest_widget_enable
 	zle -N autosuggest-disable _zsh_autosuggest_widget_disable
 	zle -N autosuggest-toggle _zsh_autosuggest_widget_toggle
+}

zsh-autosuggestions.zsh

@@ -1,6 +1,6 @@
 # Fish-like fast/unobtrusive autosuggestions for zsh.
 # https://github.com/zsh-users/zsh-autosuggestions
-# v0.4.3
+# v0.5.0
 # Copyright (c) 2013 Thiago de Arruda
 # Copyright (c) 2016-2018 Eric Freese
 # 
@@ -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,14 +44,23 @@ 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-
 
-ZSH_AUTOSUGGEST_STRATEGY=default
+# Strategies to use to fetch a suggestion
+# Will try each strategy in order until a suggestion is returned
+(( ! ${+ZSH_AUTOSUGGEST_STRATEGY} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_STRATEGY
+	ZSH_AUTOSUGGEST_STRATEGY=(history)
+}
 
 # Widgets that clear the suggestion
+(( ! ${+ZSH_AUTOSUGGEST_CLEAR_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_CLEAR_WIDGETS
 	ZSH_AUTOSUGGEST_CLEAR_WIDGETS=(
 		history-search-forward
 		history-search-backward
@@ -63,8 +74,11 @@ ZSH_AUTOSUGGEST_CLEAR_WIDGETS=(
 		down-line-or-history
 		accept-line
 	)
+}
 
 # Widgets that accept the entire suggestion
+(( ! ${+ZSH_AUTOSUGGEST_ACCEPT_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
 	ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(
 		forward-char
 		end-of-line
@@ -72,12 +86,18 @@ ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(
 		vi-end-of-line
 		vi-add-eol
 	)
+}
 
 # Widgets that accept the entire suggestion and execute it
+(( ! ${+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} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS
 	ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=(
 		forward-word
 		emacs-forward-word
@@ -88,8 +108,12 @@ ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=(
 		vi-find-next-char
 		vi-find-next-char-skip
 	)
+}
 
 # Widgets that should be ignored (globbing supported but must be escaped)
+# 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
@@ -99,12 +123,15 @@ ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(
 		yank
 		yank-pop
 	)
+}
 
-# Max size of buffer to trigger autosuggestion. Leave undefined for no upper bound.
+# 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                                                  #
@@ -206,11 +233,33 @@ _zsh_autosuggest_bind_widget() {
 	}"
 
 	# Create the bound widget
-	zle -N $widget _zsh_autosuggest_bound_${bind_count}_$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
 	local ignore_widgets
 
@@ -221,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
 }
 
@@ -320,54 +362,21 @@ _zsh_autosuggest_clear() {
 _zsh_autosuggest_modify() {
 	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
 }
@@ -378,13 +387,15 @@ _zsh_autosuggest_fetch() {
 		_zsh_autosuggest_async_request "$BUFFER"
 	else
 		local suggestion
-		_zsh_autosuggest_strategy_$ZSH_AUTOSUGGEST_STRATEGY "$BUFFER"
+		_zsh_autosuggest_fetch_suggestion "$BUFFER"
 		_zsh_autosuggest_suggest "$suggestion"
 	fi
 }
 
 # Offer a suggestion
 _zsh_autosuggest_suggest() {
+	emulate -L zsh
+
 	local suggestion="$1"
 
 	if [[ -n "$suggestion" ]] && (( $#BUFFER )); then
@@ -467,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
 
@@ -484,6 +555,7 @@ for action in clear modify fetch suggest accept partial_accept execute enable di
 		}"
 	done
 
+	zle -N autosuggest-redraw _zsh_autosuggest_widget_redraw
 	zle -N autosuggest-fetch _zsh_autosuggest_widget_fetch
 	zle -N autosuggest-suggest _zsh_autosuggest_widget_suggest
 	zle -N autosuggest-accept _zsh_autosuggest_widget_accept
@@ -492,15 +564,16 @@ zle -N autosuggest-execute _zsh_autosuggest_widget_execute
 	zle -N autosuggest-enable _zsh_autosuggest_widget_enable
 	zle -N autosuggest-disable _zsh_autosuggest_widget_disable
 	zle -N autosuggest-toggle _zsh_autosuggest_widget_toggle
+}
 
 #--------------------------------------------------------------------#
-# Default Suggestion Strategy                                        #
+# History Suggestion Strategy                                        #
 #--------------------------------------------------------------------#
 # Suggests the most recent history item that matches the given
 # prefix.
 #
 
-_zsh_autosuggest_strategy_default() {
+_zsh_autosuggest_strategy_history() {
 	# Reset options to defaults and enable LOCAL_OPTIONS
 	emulate -L zsh
 
@@ -577,6 +650,30 @@ _zsh_autosuggest_strategy_match_prev_cmd() {
 	typeset -g suggestion="$history[$histkey]"
 }
 
+#--------------------------------------------------------------------#
+# Fetch Suggestion                                                   #
+#--------------------------------------------------------------------#
+# Loops through all specified strategies and returns a suggestion
+# from the first strategy to provide one.
+#
+
+_zsh_autosuggest_fetch_suggestion() {
+	typeset -g suggestion
+	local -a strategies
+	local strategy
+
+	# Ensure we are working with an array
+	strategies=(${=ZSH_AUTOSUGGEST_STRATEGY})
+
+	for strategy in $strategies; do
+		# Try to get a suggestion from this strategy
+		_zsh_autosuggest_strategy_$strategy "$1"
+
+		# Break once we've found a suggestion
+		[[ -n "$suggestion" ]] && break
+	done
+}
+
 #--------------------------------------------------------------------#
 # Async                                                              #
 #--------------------------------------------------------------------#
@@ -595,9 +692,12 @@ _zsh_autosuggest_async_server() {
 		sleep 1 # Block for long enough for the signal to come through
 	}
 
-	# Output only newlines (not carriage return + newline)
+	# Don't add any extra carriage returns
 	stty -onlcr
 
+	# Don't translate carriage returns to newlines
+	stty -icrnl
+
 	# Silence any error messages
 	exec 2>/dev/null
 
@@ -610,7 +710,7 @@ _zsh_autosuggest_async_server() {
 		# Run suggestion search in the background
 		(
 			local suggestion
-			_zsh_autosuggest_strategy_$ZSH_AUTOSUGGEST_STRATEGY "$query"
+			_zsh_autosuggest_fetch_suggestion "$query"
 			echo -n -E "$suggestion"$'\0'
 		) &
 
@@ -691,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