mirror of
https://github.com/zsh-users/zsh-autosuggestions.git
synced 2024-12-29 07:34:11 +08:00
Simplify escaping of pattern and fix match_prev_cmd strategy
Maybe this is also a fix for #247, #248 and #258. Supersedes #267. Testcase: Using match_prev_cmd strategy and with these lines in history: echo '1^' echo '2^' echo '1^' type: echo (unexpected suggestion echo '1^' instead of echo '2^') echo '1^1 (wrong suggestion echo '1^1echo '1^') echo '1^# (error "bad math expression")
This commit is contained in:
parent
33b91a9dea
commit
7f8ff2867c
1
Makefile
1
Makefile
|
@ -3,7 +3,6 @@ SRC_DIR := ./src
|
||||||
SRC_FILES := \
|
SRC_FILES := \
|
||||||
$(SRC_DIR)/setup.zsh \
|
$(SRC_DIR)/setup.zsh \
|
||||||
$(SRC_DIR)/config.zsh \
|
$(SRC_DIR)/config.zsh \
|
||||||
$(SRC_DIR)/util.zsh \
|
|
||||||
$(SRC_DIR)/features.zsh \
|
$(SRC_DIR)/features.zsh \
|
||||||
$(SRC_DIR)/bind.zsh \
|
$(SRC_DIR)/bind.zsh \
|
||||||
$(SRC_DIR)/highlight.zsh \
|
$(SRC_DIR)/highlight.zsh \
|
||||||
|
|
|
@ -7,19 +7,9 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
_zsh_autosuggest_strategy_default() {
|
_zsh_autosuggest_strategy_default() {
|
||||||
# Reset options to defaults and enable LOCAL_OPTIONS
|
local prefix="$1"
|
||||||
emulate -L zsh
|
|
||||||
|
|
||||||
# Enable globbing flags so that we can use (#m)
|
|
||||||
setopt EXTENDED_GLOB
|
|
||||||
|
|
||||||
# Escape backslashes and all of the glob operators so we can use
|
|
||||||
# this string as a pattern to search the $history associative array.
|
|
||||||
# - (#m) globbing flag enables setting references for match data
|
|
||||||
local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
|
|
||||||
|
|
||||||
# Get the history items that match
|
# Get the history items that match
|
||||||
# - (r) subscript flag makes the pattern match on values
|
# - (r) subscript flag makes the pattern match on values
|
||||||
suggestion="${history[(r)$prefix*]}"
|
suggestion="${history[(r)${(b)prefix}*]}"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,18 +21,18 @@
|
||||||
# `HIST_EXPIRE_DUPS_FIRST`.
|
# `HIST_EXPIRE_DUPS_FIRST`.
|
||||||
|
|
||||||
_zsh_autosuggest_strategy_match_prev_cmd() {
|
_zsh_autosuggest_strategy_match_prev_cmd() {
|
||||||
local prefix="${1//(#m)[\\()\[\]|*?~]/\\$MATCH}"
|
local prefix="$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*
|
||||||
local history_match_keys
|
local history_match_keys
|
||||||
history_match_keys=(${(k)history[(R)$prefix*]})
|
history_match_keys=(${(k)history[(R)${(b)prefix}*]})
|
||||||
|
|
||||||
# By default we use the first history number (most recent history entry)
|
# By default we use the first history number (most recent history entry)
|
||||||
local histkey="${history_match_keys[1]}"
|
local histkey="${history_match_keys[1]}"
|
||||||
|
|
||||||
# Get the previously executed command
|
# Get the previously executed command
|
||||||
local prev_cmd="$(_zsh_autosuggest_escape_command "${history[$((HISTCMD-1))]}")"
|
local prev_cmd="${history[$((HISTCMD-1))]}"
|
||||||
|
|
||||||
# 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
|
||||||
|
|
11
src/util.zsh
11
src/util.zsh
|
@ -1,11 +0,0 @@
|
||||||
|
|
||||||
#--------------------------------------------------------------------#
|
|
||||||
# Utility Functions #
|
|
||||||
#--------------------------------------------------------------------#
|
|
||||||
|
|
||||||
_zsh_autosuggest_escape_command() {
|
|
||||||
setopt localoptions EXTENDED_GLOB
|
|
||||||
|
|
||||||
# Escape special chars in the string (requires EXTENDED_GLOB)
|
|
||||||
echo -E "${1//(#m)[\"\'\\()\[\]|*?~]/\\$MATCH}"
|
|
||||||
}
|
|
|
@ -101,17 +101,6 @@ ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=
|
||||||
# Pty name for calculating autosuggestions asynchronously
|
# Pty name for calculating autosuggestions asynchronously
|
||||||
ZSH_AUTOSUGGEST_ASYNC_PTY_NAME=zsh_autosuggest_pty
|
ZSH_AUTOSUGGEST_ASYNC_PTY_NAME=zsh_autosuggest_pty
|
||||||
|
|
||||||
#--------------------------------------------------------------------#
|
|
||||||
# Utility Functions #
|
|
||||||
#--------------------------------------------------------------------#
|
|
||||||
|
|
||||||
_zsh_autosuggest_escape_command() {
|
|
||||||
setopt localoptions EXTENDED_GLOB
|
|
||||||
|
|
||||||
# Escape special chars in the string (requires EXTENDED_GLOB)
|
|
||||||
echo -E "${1//(#m)[\"\'\\()\[\]|*?~]/\\$MATCH}"
|
|
||||||
}
|
|
||||||
|
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
# Feature Detection #
|
# Feature Detection #
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
|
@ -489,21 +478,11 @@ zle -N autosuggest-toggle _zsh_autosuggest_widget_toggle
|
||||||
#
|
#
|
||||||
|
|
||||||
_zsh_autosuggest_strategy_default() {
|
_zsh_autosuggest_strategy_default() {
|
||||||
# Reset options to defaults and enable LOCAL_OPTIONS
|
local prefix="$1"
|
||||||
emulate -L zsh
|
|
||||||
|
|
||||||
# Enable globbing flags so that we can use (#m)
|
|
||||||
setopt EXTENDED_GLOB
|
|
||||||
|
|
||||||
# Escape backslashes and all of the glob operators so we can use
|
|
||||||
# this string as a pattern to search the $history associative array.
|
|
||||||
# - (#m) globbing flag enables setting references for match data
|
|
||||||
local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
|
|
||||||
|
|
||||||
# Get the history items that match
|
# Get the history items that match
|
||||||
# - (r) subscript flag makes the pattern match on values
|
# - (r) subscript flag makes the pattern match on values
|
||||||
suggestion="${history[(r)$prefix*]}"
|
suggestion="${history[(r)${(b)prefix}*]}"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
|
@ -528,18 +507,18 @@ _zsh_autosuggest_strategy_default() {
|
||||||
# `HIST_EXPIRE_DUPS_FIRST`.
|
# `HIST_EXPIRE_DUPS_FIRST`.
|
||||||
|
|
||||||
_zsh_autosuggest_strategy_match_prev_cmd() {
|
_zsh_autosuggest_strategy_match_prev_cmd() {
|
||||||
local prefix="${1//(#m)[\\()\[\]|*?~]/\\$MATCH}"
|
local prefix="$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*
|
||||||
local history_match_keys
|
local history_match_keys
|
||||||
history_match_keys=(${(k)history[(R)$prefix*]})
|
history_match_keys=(${(k)history[(R)${(b)prefix}*]})
|
||||||
|
|
||||||
# By default we use the first history number (most recent history entry)
|
# By default we use the first history number (most recent history entry)
|
||||||
local histkey="${history_match_keys[1]}"
|
local histkey="${history_match_keys[1]}"
|
||||||
|
|
||||||
# Get the previously executed command
|
# Get the previously executed command
|
||||||
local prev_cmd="$(_zsh_autosuggest_escape_command "${history[$((HISTCMD-1))]}")"
|
local prev_cmd="${history[$((HISTCMD-1))]}"
|
||||||
|
|
||||||
# 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
|
||||||
|
|
Loading…
Reference in New Issue
Block a user