mirror of
https://github.com/zsh-users/zsh-autosuggestions.git
synced 2025-12-06 15:20:40 +01:00
Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c761dc8150 | ||
|
|
cc921994e6 | ||
|
|
0242c7eff1 | ||
|
|
9d100f4f32 | ||
|
|
ddb7284852 | ||
|
|
2a5791710a | ||
|
|
03fac1f0d7 | ||
|
|
aa859a282d | ||
|
|
f08a5a1baa | ||
|
|
70438d233d |
@@ -102,7 +102,7 @@ testWidgetFunctionModify() {
|
|||||||
POSTDISPLAY=""
|
POSTDISPLAY=""
|
||||||
|
|
||||||
stub_and_eval \
|
stub_and_eval \
|
||||||
_zsh_autosuggest_invoke_original_widget \
|
_zsh_autosuggest_invoke_original_widget \
|
||||||
'BUFFER+="e"'
|
'BUFFER+="e"'
|
||||||
|
|
||||||
stub_and_echo \
|
stub_and_echo \
|
||||||
@@ -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
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ _zsh_autosuggest_highlight_reset() {
|
|||||||
_zsh_autosuggest_highlight_apply() {
|
_zsh_autosuggest_highlight_apply() {
|
||||||
if [ $#POSTDISPLAY -gt 0 ]; then
|
if [ $#POSTDISPLAY -gt 0 ]; then
|
||||||
_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT="$#BUFFER $(($#BUFFER + $#POSTDISPLAY)) $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
|
_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT="$#BUFFER $(($#BUFFER + $#POSTDISPLAY)) $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
|
||||||
region_highlight+=($_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT)
|
region_highlight+=("$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT")
|
||||||
else
|
else
|
||||||
unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
|
unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -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}"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Fish-like fast/unobtrusive autosuggestions for zsh.
|
# Fish-like fast/unobtrusive autosuggestions for zsh.
|
||||||
# https://github.com/tarruda/zsh-autosuggestions
|
# https://github.com/tarruda/zsh-autosuggestions
|
||||||
# v0.2.11
|
# v0.2.15
|
||||||
# Copyright (c) 2013 Thiago de Arruda
|
# Copyright (c) 2013 Thiago de Arruda
|
||||||
# Copyright (c) 2016 Eric Freese
|
# Copyright (c) 2016 Eric Freese
|
||||||
#
|
#
|
||||||
@@ -196,7 +196,7 @@ _zsh_autosuggest_highlight_reset() {
|
|||||||
_zsh_autosuggest_highlight_apply() {
|
_zsh_autosuggest_highlight_apply() {
|
||||||
if [ $#POSTDISPLAY -gt 0 ]; then
|
if [ $#POSTDISPLAY -gt 0 ]; then
|
||||||
_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT="$#BUFFER $(($#BUFFER + $#POSTDISPLAY)) $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
|
_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT="$#BUFFER $(($#BUFFER + $#POSTDISPLAY)) $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
|
||||||
region_highlight+=($_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT)
|
region_highlight+=("$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT")
|
||||||
else
|
else
|
||||||
unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
|
unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
|
||||||
fi
|
fi
|
||||||
@@ -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}"
|
||||||
}
|
}
|
||||||
|
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
|
|||||||
Reference in New Issue
Block a user