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

Rename escape command function

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

14
script/test.zsh
View file

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

2
src/strategies/default.zsh
View file

@ -7,7 +7,7 @@
# #
_zsh_autosuggest_strategy_default() { _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 # Get the hist number of the most recent history item that matches
local histkey="${${(@k)history[(R)$prefix*]}[1]}" local histkey="${${(@k)history[(R)$prefix*]}[1]}"

4
src/strategies/match_prev_cmd.zsh
View file

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

2
src/suggestion.zsh
View file

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

8
zsh-autosuggestions.zsh
View file

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