linux/zsh-autosuggestions
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh-autosuggestions.git synced 2024-11-18 09:51:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix backslash escaping problems with echo -E.

Browse source
This commit is contained in:
Eric Freese 2016-02-23 20:11:56 -07:00
parent 2a5791710a
commit ddb7284852
3 changed files with 55 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
script/test.zsh
View file

@ -281,6 +281,43 @@ testWidgetClear() {
"stub_called _zsh_autosuggest_highlight_apply" "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 # For zsh compatibility
setopt shwordsplit setopt shwordsplit
SHUNIT_PARENT=$0 SHUNIT_PARENT=$0

14
src/suggestion.zsh
View file

@ -5,15 +5,19 @@
# Get a suggestion from history that matches a given prefix # Get a suggestion from history that matches a given prefix
_zsh_autosuggest_suggestion() { _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* # Get all history items (reversed) that match pattern $prefix*
local history_matches local history_matches
history_matches=(${(j:\0:s:\0:)history[(R)$prefix*]}) history_matches=(${(j:\0:s:\0:)history[(R)$prefix*]})
# Echo the first item that matches # Echo the first item that matches
echo "$history_matches[1]" 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}"
} }

14
zsh-autosuggestions.zsh
View file

@ -291,17 +291,21 @@ zle -N autosuggest-clear _zsh_autosuggest_widget_clear
# Get a suggestion from history that matches a given prefix # Get a suggestion from history that matches a given prefix
_zsh_autosuggest_suggestion() { _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* # Get all history items (reversed) that match pattern $prefix*
local history_matches local history_matches
history_matches=(${(j:\0:s:\0:)history[(R)$prefix*]}) history_matches=(${(j:\0:s:\0:)history[(R)$prefix*]})
# Echo the first item that matches # Echo the first item that matches
echo "$history_matches[1]" 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}"
} }
#--------------------------------------------------------------------# #--------------------------------------------------------------------#