bump version v0.2.15

This reverts commit 70438d233d.

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.9
+v0.2.15

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 \
@@ -281,6 +281,43 @@ testWidgetClear() {
 		"stub_called _zsh_autosuggest_highlight_apply"
 }
 
+testEscapeCommandPrefix() {
+	assertEquals \
+		"Did not escape single backslash" \
+		"\\\\" \
+		"$(_zsh_autosuggest_escape_command_prefix "\\")"
+
+	assertEquals \
+		"Did not escape two backslashes" \
+		"\\\\\\\\" \
+		"$(_zsh_autosuggest_escape_command_prefix "\\\\")"
+
+	assertEquals \
+		"Did not escape parentheses" \
+		"\\(\\)" \
+		"$(_zsh_autosuggest_escape_command_prefix "()")"
+
+	assertEquals \
+		"Did not escape square brackets" \
+		"\\[\\]" \
+		"$(_zsh_autosuggest_escape_command_prefix "[]")"
+
+	assertEquals \
+		"Did not escape pipe" \
+		"\\|" \
+		"$(_zsh_autosuggest_escape_command_prefix "|")"
+
+	assertEquals \
+		"Did not escape star" \
+		"\\*" \
+		"$(_zsh_autosuggest_escape_command_prefix "*")"
+
+	assertEquals \
+		"Did not escape question mark" \
+		"\\?" \
+		"$(_zsh_autosuggest_escape_command_prefix "?")"
+}
+
 # For zsh compatibility
 setopt shwordsplit
 SHUNIT_PARENT=$0

src/bind.zsh

@@ -66,6 +66,9 @@ _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

src/highlight.zsh

@@ -15,7 +15,7 @@ _zsh_autosuggest_highlight_reset() {
 _zsh_autosuggest_highlight_apply() {
 	if [ $#POSTDISPLAY -gt 0 ]; then
 		_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT="$#BUFFER $(($#BUFFER + $#POSTDISPLAY)) $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
-		region_highlight+=($_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT)
+		region_highlight+=("$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT")
 	else
 		unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
 	fi

src/suggestion.zsh

@@ -5,10 +5,19 @@
 
 # Get a suggestion from history that matches a given prefix
 _zsh_autosuggest_suggestion() {
-	setopt localoptions extendedglob
+	local prefix="$(_zsh_autosuggest_escape_command_prefix "$1")"
 
-	# Escape the prefix (requires EXTENDED_GLOB)
-	local prefix="${1//(#m)[\][()|\\*?#<>~^]/\\$MATCH}"
+	# Get all history items (reversed) that match pattern $prefix*
+	local history_matches
+	history_matches=(${(j:\0:s:\0:)history[(R)$prefix*]})
 
-	fc -ln -m "$prefix*" 2>/dev/null | tail -1
+	# Echo the first item that matches
+	echo -E "$history_matches[1]"
+}
+
+_zsh_autosuggest_escape_command_prefix() {
+	setopt localoptions EXTENDED_GLOB
+
+	# Escape special chars in the string (requires EXTENDED_GLOB)
+	echo -E "${1//(#m)[\\()\[\]|*?]/\\$MATCH}"
 }

zsh-autosuggestions.zsh

@@ -1,6 +1,6 @@
 # Fish-like fast/unobtrusive autosuggestions for zsh.
 # https://github.com/tarruda/zsh-autosuggestions
-# v0.2.9
+# v0.2.15
 # Copyright (c) 2013 Thiago de Arruda
 # Copyright (c) 2016 Eric Freese
 # 
@@ -168,6 +168,9 @@ _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
@@ -193,7 +196,7 @@ _zsh_autosuggest_highlight_reset() {
 _zsh_autosuggest_highlight_apply() {
 	if [ $#POSTDISPLAY -gt 0 ]; then
 		_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT="$#BUFFER $(($#BUFFER + $#POSTDISPLAY)) $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
-		region_highlight+=($_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT)
+		region_highlight+=("$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT")
 	else
 		unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
 	fi
@@ -288,12 +291,21 @@ zle -N autosuggest-clear _zsh_autosuggest_widget_clear
 
 # Get a suggestion from history that matches a given prefix
 _zsh_autosuggest_suggestion() {
-	setopt localoptions extendedglob
+	local prefix="$(_zsh_autosuggest_escape_command_prefix "$1")"
 
-	# Escape the prefix (requires EXTENDED_GLOB)
-	local prefix="${1//(#m)[\][()|\\*?#<>~^]/\\$MATCH}"
+	# Get all history items (reversed) that match pattern $prefix*
+	local history_matches
+	history_matches=(${(j:\0:s:\0:)history[(R)$prefix*]})
 
-	fc -ln -m "$prefix*" 2>/dev/null | tail -1
+	# Echo the first item that matches
+	echo -E "$history_matches[1]"
+}
+
+_zsh_autosuggest_escape_command_prefix() {
+	setopt localoptions EXTENDED_GLOB
+
+	# Escape special chars in the string (requires EXTENDED_GLOB)
+	echo -E "${1//(#m)[\\()\[\]|*?]/\\$MATCH}"
 }
 
 #--------------------------------------------------------------------#