Rename escape command function

This commit is contained in:
Eric Freese 2016-03-04 19:22:19 -07:00
parent 73f774bd5d
commit ee6dde9ee8
5 changed files with 15 additions and 15 deletions

View file

@ -334,37 +334,37 @@ testEscapeCommandPrefix() {
assertEquals \
"Did not escape single backslash" \
"\\\\" \
"$(_zsh_autosuggest_escape_command_prefix "\\")"
"$(_zsh_autosuggest_escape_command "\\")"
assertEquals \
"Did not escape two backslashes" \
"\\\\\\\\" \
"$(_zsh_autosuggest_escape_command_prefix "\\\\")"
"$(_zsh_autosuggest_escape_command "\\\\")"
assertEquals \
"Did not escape parentheses" \
"\\(\\)" \
"$(_zsh_autosuggest_escape_command_prefix "()")"
"$(_zsh_autosuggest_escape_command "()")"
assertEquals \
"Did not escape square brackets" \
"\\[\\]" \
"$(_zsh_autosuggest_escape_command_prefix "[]")"
"$(_zsh_autosuggest_escape_command "[]")"
assertEquals \
"Did not escape pipe" \
"\\|" \
"$(_zsh_autosuggest_escape_command_prefix "|")"
"$(_zsh_autosuggest_escape_command "|")"
assertEquals \
"Did not escape star" \
"\\*" \
"$(_zsh_autosuggest_escape_command_prefix "*")"
"$(_zsh_autosuggest_escape_command "*")"
assertEquals \
"Did not escape question mark" \
"\\?" \
"$(_zsh_autosuggest_escape_command_prefix "?")"
"$(_zsh_autosuggest_escape_command "?")"
}
# For zsh compatibility

View file

@ -7,7 +7,7 @@
#
_zsh_autosuggest_strategy_default() {
local prefix="$(_zsh_autosuggest_escape_command_prefix "$1")"
local prefix="$(_zsh_autosuggest_escape_command "$1")"
# Get the hist number of the most recent history item that matches
local histkey="${${(@k)history[(R)$prefix*]}[1]}"

View file

@ -17,7 +17,7 @@
#
_zsh_autosuggest_strategy_match_prev_cmd() {
local prefix="$(_zsh_autosuggest_escape_command_prefix "$1")"
local prefix="$(_zsh_autosuggest_escape_command "$1")"
# Get all history event numbers that correspond to history
# entries that match pattern $prefix*
@ -29,7 +29,7 @@ _zsh_autosuggest_strategy_match_prev_cmd() {
# Get the previously executed command
local prev_cmd="$(_zsh_autosuggest_prev_command)"
prev_cmd="$(_zsh_autosuggest_escape_command_prefix $prev_cmd)"
prev_cmd="$(_zsh_autosuggest_escape_command $prev_cmd)"
# Iterate up to the first 200 history event numbers that match $prefix
for key in "${(@)history_match_keys[1,200]}"; do

View file

@ -13,7 +13,7 @@ _zsh_autosuggest_suggestion() {
fi
}
_zsh_autosuggest_escape_command_prefix() {
_zsh_autosuggest_escape_command() {
setopt localoptions EXTENDED_GLOB
# Escape special chars in the string (requires EXTENDED_GLOB)

View file

@ -323,7 +323,7 @@ _zsh_autosuggest_suggestion() {
fi
}
_zsh_autosuggest_escape_command_prefix() {
_zsh_autosuggest_escape_command() {
setopt localoptions EXTENDED_GLOB
# Escape special chars in the string (requires EXTENDED_GLOB)
@ -343,7 +343,7 @@ _zsh_autosuggest_prev_command() {
#
_zsh_autosuggest_strategy_default() {
local prefix="$(_zsh_autosuggest_escape_command_prefix "$1")"
local prefix="$(_zsh_autosuggest_escape_command "$1")"
# Get the hist number of the most recent history item that matches
local histkey="${${(@k)history[(R)$prefix*]}[1]}"
@ -370,7 +370,7 @@ _zsh_autosuggest_strategy_default() {
#
_zsh_autosuggest_strategy_match_prev_cmd() {
local prefix="$(_zsh_autosuggest_escape_command_prefix "$1")"
local prefix="$(_zsh_autosuggest_escape_command "$1")"
# Get all history event numbers that correspond to history
# entries that match pattern $prefix*
@ -382,7 +382,7 @@ _zsh_autosuggest_strategy_match_prev_cmd() {
# Get the previously executed command
local prev_cmd="$(_zsh_autosuggest_prev_command)"
prev_cmd="$(_zsh_autosuggest_escape_command_prefix $prev_cmd)"
prev_cmd="$(_zsh_autosuggest_escape_command $prev_cmd)"
# Iterate up to the first 200 history event numbers that match $prefix
for key in "${(@)history_match_keys[1,200]}"; do