mirrors/zsh-history-substring-search
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh-history-substring-search synced 2024-09-20 16:19:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

revise comments; optimize multi-line buffer checks

Browse source
This commit is contained in:
Guido van Steen 2011-06-13 23:14:30 -07:00 committed by Suraj N. Kurapati
parent 1d7ea438d3
commit c322b844f1
1 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
history-substring-search.zsh
View file

@ -126,24 +126,35 @@ history-substring-search-end() {
[[ $history_substring_search_move_cursor_eol == true ]] && CURSOR=${#BUFFER} [[ $history_substring_search_move_cursor_eol == true ]] && CURSOR=${#BUFFER}
# for debugging purposes: # for debugging purposes:
#zle -R "mn: "$history_substring_search_match_number" m#: "${#history_substring_search_matches} # zle -R "mn: "$history_substring_search_match_number" m#: "${#history_substring_search_matches}
#read -k -t 200 && zle -U $REPLY # read -k -t 200 && zle -U $REPLY
# suppress any errors:
true true
} }
history-substring-search-backward() { history-substring-search-backward() {
history-substring-search-begin history-substring-search-begin
# check if the UP arrow was pressed to move cursor in multi-line buffer: # Check if the UP arrow was pressed to move the cursor within a multi-line
# First create XLBUFFER (i.e. Xtended LBUFFER). Add an X before the cursor, # buffer. This amounts to three tests:
# so that we can later detect whether there is a newline immediately before #
# the current cursor. # 1. $#buflines -gt 1
#
# 2. $CURSOR -ne $#BUFFER
#
# 3. Check if we are on the first line of the current multi-line buffer.
# If so, pressing UP would amount to leaving the multi-line buffer.
#
# We check this by adding an extra "x" to $LBUFFER, which makes sure that
# xlbuflines is always equal to the number of lines until $CURSOR
# (including the line with the cursor on it).
#
buflines=(${(f)BUFFER}) buflines=(${(f)BUFFER})
local XLBUFFER=$LBUFFER"x" local XLBUFFER=$LBUFFER"x"
xlbuflines=(${(f)XLBUFFER}) xlbuflines=(${(f)XLBUFFER})
if [[ $#buflines -gt 1 && $#xlbuflines -ne 1 && $#BUFFER -ne $#LBUFFER ]]; then if [[ $#buflines -gt 1 && $CURSOR -ne $#BUFFER && $#xlbuflines -ne 1 ]]; then
zle up-line-or-history zle up-line-or-history
history_substring_search_move_cursor_eol=false history_substring_search_move_cursor_eol=false
else else
@ -177,15 +188,25 @@ history-substring-search-backward() {
history-substring-search-forward() { history-substring-search-forward() {
history-substring-search-begin history-substring-search-begin
# check if the DOWN arrow was pressed to move cursor in multi-line buffer: # Check if the DOWN arrow was pressed to move the cursor within a multi-line
# First create XRBUFFER (i.e. Xtended RBUFFER). Add an X after the cursor, # buffer. This amounts to three tests:
# so that we can later detect whether there is a newline immediately behind #
# the current cursor. # 1. $#buflines -gt 1
#
# 2. $CURSOR -ne $#BUFFER
#
# 3. Check if we are on the last line of the current multi-line buffer.
# If so, pressing DOWN would amount to leaving the multi-line buffer.
#
# We check this by adding an extra "x" to $RBUFFER, which makes sure that
# xrbuflines is always equal to the number of lines from $CURSOR
# (including the line with the cursor on it).
#
buflines=(${(f)BUFFER}) buflines=(${(f)BUFFER})
local XRBUFFER="x"$RBUFFER local XRBUFFER="x"$RBUFFER
xrbuflines=(${(f)XRBUFFER}) xrbuflines=(${(f)XRBUFFER})
if [[ $#buflines -gt 1 && $#xrbuflines -ne 1 && $#BUFFER -ne $#LBUFFER ]]; then if [[ $#buflines -gt 1 && $CURSOR -ne $#BUFFER && $#xrbuflines -ne 1 ]]; then
zle down-line-or-history zle down-line-or-history
history_substring_search_move_cursor_eol=false history_substring_search_move_cursor_eol=false
else else