bump version v0.2.12

Force field splitting on \0 to support sh_word_split option.

README.md

@@ -4,6 +4,7 @@ _[Fish](http://fishshell.com/)-like fast/unobtrusive autosuggestions for zsh._
 
 It suggests commands as you type, based on command history.
 
+<a href="https://asciinema.org/a/36578" target="_blank"><img src="https://asciinema.org/a/36578.png" width="520"/></a>
 
 ## Installation
 

VERSION

@@ -1 +1 @@
-v0.2.6
+v0.2.12

script/test.zsh

@@ -102,7 +102,7 @@ testWidgetFunctionModify() {
 	POSTDISPLAY=""
 
 	stub_and_eval \
-		 _zsh_autosuggest_invoke_original_widget \
+		_zsh_autosuggest_invoke_original_widget \
 		'BUFFER+="e"'
 
 	stub_and_echo \

src/bind.zsh

@@ -38,7 +38,7 @@ _zsh_autosuggest_bind_widget() {
 	# zle without the `-w` flag (e.g. `zle self-insert` instead of
 	# `zle self-insert -w`).
 	eval "_zsh_autosuggest_bound_$widget() {
-		_zsh_autosuggest_widget_$autosuggest_action $prefix$widget $@
+		_zsh_autosuggest_widget_$autosuggest_action $prefix$widget \$@
 	}"
 
 	# Create the bound widget
@@ -66,11 +66,14 @@ _zsh_autosuggest_bind_widgets() {
 
 # Given the name of an original widget and args, invoke it, if it exists
 _zsh_autosuggest_invoke_original_widget() {
+	# Do nothing unless called with at least one arg
+	[ $# -gt 0 ] || return
+
 	local original_widget_name=$1
 
 	shift
 
 	if [ $widgets[$original_widget_name] ]; then
-		zle $original_widget_name -- $@
+		zle $original_widget_name -w -- $@
 	fi
 }

src/suggestion.zsh

@@ -8,12 +8,12 @@ _zsh_autosuggest_suggestion() {
 	setopt localoptions extendedglob
 
 	# Escape the prefix (requires EXTENDED_GLOB)
-	local prefix=${1//(#m)[\][()|\\*?#<>~^]/\\$MATCH}
+	local prefix="${1//(#m)[\][()|\\*?#<>~^]/\\$MATCH}"
 
 	# Get all history items (reversed) that match pattern $prefix*
 	local history_matches
-	history_matches=(${history[(R)$prefix*]})
+	history_matches=(${(j:\0:s:\0:)history[(R)$prefix*]})
 
 	# Echo the first item that matches
-	echo ${history_matches[1]}
+	echo "$history_matches[1]"
 }

src/widgets.zsh

@@ -19,7 +19,7 @@ _zsh_autosuggest_modify() {
 	# Get a new suggestion if the buffer is not empty after modification
 	local suggestion
 	if [ $#BUFFER -gt 0 ]; then
-		suggestion=$(_zsh_autosuggest_suggestion $BUFFER)
+		suggestion=$(_zsh_autosuggest_suggestion "$BUFFER")
 	fi
 
 	# Add the suggestion to the POSTDISPLAY

zsh-autosuggestions.zsh

@@ -1,6 +1,6 @@
 # Fish-like fast/unobtrusive autosuggestions for zsh.
 # https://github.com/tarruda/zsh-autosuggestions
-# v0.2.6
+# v0.2.12
 # Copyright (c) 2013 Thiago de Arruda
 # Copyright (c) 2016 Eric Freese
 # 
@@ -140,7 +140,7 @@ _zsh_autosuggest_bind_widget() {
 	# zle without the `-w` flag (e.g. `zle self-insert` instead of
 	# `zle self-insert -w`).
 	eval "_zsh_autosuggest_bound_$widget() {
-		_zsh_autosuggest_widget_$autosuggest_action $prefix$widget $@
+		_zsh_autosuggest_widget_$autosuggest_action $prefix$widget \$@
 	}"
 
 	# Create the bound widget
@@ -168,12 +168,15 @@ _zsh_autosuggest_bind_widgets() {
 
 # Given the name of an original widget and args, invoke it, if it exists
 _zsh_autosuggest_invoke_original_widget() {
+	# Do nothing unless called with at least one arg
+	[ $# -gt 0 ] || return
+
 	local original_widget_name=$1
 
 	shift
 
 	if [ $widgets[$original_widget_name] ]; then
-		zle $original_widget_name -- $@
+		zle $original_widget_name -w -- $@
 	fi
 }
 
@@ -219,7 +222,7 @@ _zsh_autosuggest_modify() {
 	# Get a new suggestion if the buffer is not empty after modification
 	local suggestion
 	if [ $#BUFFER -gt 0 ]; then
-		suggestion=$(_zsh_autosuggest_suggestion $BUFFER)
+		suggestion=$(_zsh_autosuggest_suggestion "$BUFFER")
 	fi
 
 	# Add the suggestion to the POSTDISPLAY
@@ -291,14 +294,14 @@ _zsh_autosuggest_suggestion() {
 	setopt localoptions extendedglob
 
 	# Escape the prefix (requires EXTENDED_GLOB)
-	local prefix=${1//(#m)[\][()|\\*?#<>~^]/\\$MATCH}
+	local prefix="${1//(#m)[\][()|\\*?#<>~^]/\\$MATCH}"
 
 	# Get all history items (reversed) that match pattern $prefix*
 	local history_matches
-	history_matches=(${history[(R)$prefix*]})
+	history_matches=(${(j:\0:s:\0:)history[(R)$prefix*]})
 
 	# Echo the first item that matches
-	echo ${history_matches[1]}
+	echo "$history_matches[1]"
 }
 
 #--------------------------------------------------------------------#