aselimov/zsh-history-substring-search
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor repeated ZLE region highlighting logic

Browse source
This commit is contained in:
Suraj N. Kurapati 2011-05-25 11:29:22 -07:00
parent dcc4f7ffb0
commit 415b5c60c7
1 changed files with 20 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

68
history-substring-search.zsh
View file

@ -81,9 +81,22 @@ history-substring-search-begin() {
} }
history-substring-search-highlight() { history-substring-search-highlight() {
# highlight $BUFFER using zsh-syntax-highlighting plugin
# https://github.com/nicoulaj/zsh-syntax-highlighting
if [[ ((( $F_zsh_highlighting_available == 1 ) && ( $+BUFFER < $F_max_buffer_size) )) ]]; then if [[ ((( $F_zsh_highlighting_available == 1 ) && ( $+BUFFER < $F_max_buffer_size) )) ]]; then
_zsh_highlight-zle-buffer _zsh_highlight-zle-buffer
fi fi
if [[ $F_search4later != "" ]]; then
# F_search string was not empty: highlight it
# among other things, the following expression yields a variable $MEND,
# which indicates the end position of the first occurrence of $F_search
# in $BUFFER
: ${(S)BUFFER##(#m)($F_search4later##)}
let "F_my_mbegin = $MEND - $#F_search4later"
# this is slightly more informative than highlighting that fish performs
region_highlight=("$F_my_mbegin $MEND $1")
fi
} }
history-substring-search-end() { history-substring-search-end() {
@ -103,41 +116,20 @@ history-substring-search-backward() {
let "F_match_number = $F_match_number - 1" let "F_match_number = $F_match_number - 1"
F_command_to_be_retrieved=$history[$F_matches[$F_match_number]] F_command_to_be_retrieved=$history[$F_matches[$F_match_number]]
BUFFER=$F_command_to_be_retrieved BUFFER=$F_command_to_be_retrieved
history-substring-search-highlight history-substring-search-highlight $F_ordinary_highlight
if [[ $F_search4later != "" ]]; then
# F_search string was not empty: highlight it
# among other things the following expression yields a variable $MEND,
# which indicates the end position of the first occurrence of $F_search
# in $BUFFER
: ${(S)BUFFER##(#m)($F_search4later##)}
let "F_my_mbegin = $MEND - $#F_search4later"
region_highlight=("$F_my_mbegin $MEND $F_ordinary_highlight")
fi
else else
if [[ ($F_match_number -eq 1) ]]; then if [[ ($F_match_number -eq 1) ]]; then
# we will move out of the F_matches # we will move out of the F_matches
let "F_match_number = $F_match_number - 1" let "F_match_number = $F_match_number - 1"
F_old_buffer_backward=$BUFFER F_old_buffer_backward=$BUFFER
BUFFER=$F_search4later BUFFER=$F_search4later
history-substring-search-highlight history-substring-search-highlight $F_out_of_matches_highlight
if [[ $F_search4later != "" ]]; then
: ${(S)BUFFER##(#m)($F_search4later##)}
let "F_my_mbegin = $MEND - $#F_search4later"
# this is slightly more informative than highlighting that fish
# performs
region_highlight=("$F_my_mbegin $MEND $F_out_of_matches_highlight")
fi
else else
if [[ ($F_match_number -eq $F_number_of_matches_plus_one ) ]]; then if [[ ($F_match_number -eq $F_number_of_matches_plus_one ) ]]; then
# we will move back to the F_matches # we will move back to the F_matches
let "F_match_number = $F_match_number - 1" let "F_match_number = $F_match_number - 1"
BUFFER=$F_old_buffer_forward BUFFER=$F_old_buffer_forward
history-substring-search-highlight history-substring-search-highlight $F_ordinary_highlight
if [[ $F_search4later != "" ]]; then
: ${(S)BUFFER##(#m)($F_search4later##)}
let "F_my_mbegin = $MEND - $#F_search4later"
region_highlight=("$F_my_mbegin $MEND $F_ordinary_highlight")
fi
fi fi
fi fi
fi fi
@ -152,43 +144,23 @@ history-substring-search-forward() {
let "F_match_number = $F_match_number" let "F_match_number = $F_match_number"
F_old_buffer_forward=$BUFFER F_old_buffer_forward=$BUFFER
BUFFER=$F_search4later BUFFER=$F_search4later
history-substring-search-highlight history-substring-search-highlight $F_out_of_matches_highlight
if [[ $F_search4later != "" ]]; then
: ${(S)BUFFER##(#m)($F_search4later##)}
let "F_my_mbegin = $MEND - $#F_search4later"
region_highlight=("$F_my_mbegin $MEND $F_out_of_matches_highlight")
fi
elif [[ ($F_match_number -ge 0 && $F_match_number -le $F_number_of_matches_minus_one) ]]; then elif [[ ($F_match_number -ge 0 && $F_match_number -le $F_number_of_matches_minus_one) ]]; then
let "F_match_number = $F_match_number + 1" let "F_match_number = $F_match_number + 1"
F_command_to_be_retrieved=$history[$F_matches[$F_match_number]] F_command_to_be_retrieved=$history[$F_matches[$F_match_number]]
BUFFER=$F_command_to_be_retrieved BUFFER=$F_command_to_be_retrieved
history-substring-search-highlight history-substring-search-highlight $F_ordinary_highlight
if [[ $F_search4later != "" ]]; then
: ${(S)BUFFER##(#m)($F_search4later##)}
let "F_my_mbegin = $MEND - $#F_search4later"
region_highlight=("$F_my_mbegin $MEND $F_ordinary_highlight")
fi
else else
if [[ ($F_match_number -eq $F_number_of_matches ) ]]; then if [[ ($F_match_number -eq $F_number_of_matches ) ]]; then
let "F_match_number = $F_match_number + 1" let "F_match_number = $F_match_number + 1"
F_old_buffer_forward=$BUFFER F_old_buffer_forward=$BUFFER
BUFFER=$F_search4later BUFFER=$F_search4later
history-substring-search-highlight history-substring-search-highlight $F_out_of_matches_highlight
if [[ $F_search4later != "" ]]; then
: ${(S)BUFFER##(#m)($F_search4later##)}
let "F_my_mbegin = $MEND - $#F_search4later"
region_highlight=("$F_my_mbegin $MEND $F_out_of_matches_highlight")
fi
else else
if [[ ($F_match_number -eq 0 ) ]]; then if [[ ($F_match_number -eq 0 ) ]]; then
let "F_match_number = $F_match_number + 1" let "F_match_number = $F_match_number + 1"
BUFFER=$F_old_buffer_backward BUFFER=$F_old_buffer_backward
history-substring-search-highlight history-substring-search-highlight $F_ordinary_highlight
if [[ $F_search4later != "" ]]; then
: ${(S)BUFFER##(#m)($F_search4later##)}
let "F_my_mbegin = $MEND - $#F_search4later"
region_highlight=("$F_my_mbegin $MEND $F_ordinary_highlight")
fi
fi fi
fi fi
fi fi