stonewareslord/zsh-syntax-highlighting
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

'brackets': Lift local declarations from inside loops

Browse Source
This commit is contained in:
Matthew Martin 2016-04-24 21:02:20 -05:00
parent cef49752fd
commit fd84010252
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
highlighters/brackets/brackets-highlighter.zsh
View File

@ -46,14 +46,13 @@ _zsh_highlight_brackets_highlighter_predicate()
# Brackets highlighting function. # Brackets highlighting function.
_zsh_highlight_brackets_highlighter() _zsh_highlight_brackets_highlighter()
{ {
local level=0 pos local char quotetype style
local -i bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} buflen=${#BUFFER} level=0 pos
local -A levelpos lastoflevel matching typepos local -A levelpos lastoflevel matching typepos
integer buflen=${#BUFFER}
region_highlight=()
# Find all brackets and remember which one is matching # Find all brackets and remember which one is matching
for (( pos = 0; pos < buflen; pos++ )) ; do for (( pos = 0; pos < buflen; pos++ )) ; do
local char="$BUFFER[pos+1]" char="$BUFFER[pos+1]"
case $char in case $char in
["([{"]) ["([{"])
levelpos[$pos]=$((++level)) levelpos[$pos]=$((++level))
@ -68,7 +67,7 @@ _zsh_highlight_brackets_highlighter()
;; ;;
['"'\']) ['"'\'])
# Skip everything inside quotes # Skip everything inside quotes
local quotetype=$char quotetype=$char
while (( pos < buflen )) ; do while (( pos < buflen )) ; do
(( pos++ )) (( pos++ ))
[[ $BUFFER[pos+1] == $quotetype ]] && break [[ $BUFFER[pos+1] == $quotetype ]] && break
@ -80,12 +79,10 @@ _zsh_highlight_brackets_highlighter()
# Now highlight all found brackets # Now highlight all found brackets
for pos in ${(k)levelpos}; do for pos in ${(k)levelpos}; do
if [[ -n $matching[$pos] ]] && [[ $typepos[$pos] == $typepos[$matching[$pos]] ]]; then if [[ -n $matching[$pos] ]] && [[ $typepos[$pos] == $typepos[$matching[$pos]] ]]; then
local bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} style=bracket-level-$(( (levelpos[$pos] - 1) % bracket_color_size + 1 ))
local bracket_color_level=bracket-level-$(( (levelpos[$pos] - 1) % bracket_color_size + 1 ))
local style=$bracket_color_level
_zsh_highlight_add_highlight $pos $((pos + 1)) $style _zsh_highlight_add_highlight $pos $((pos + 1)) $style
else else
local style=bracket-error style=bracket-error
_zsh_highlight_add_highlight $pos $((pos + 1)) $style _zsh_highlight_add_highlight $pos $((pos + 1)) $style
fi fi
done done
@ -93,9 +90,8 @@ _zsh_highlight_brackets_highlighter()
# If cursor is on a bracket, then highlight corresponding bracket, if any # If cursor is on a bracket, then highlight corresponding bracket, if any
pos=$CURSOR pos=$CURSOR
if [[ -n $levelpos[$pos] ]] && [[ -n $matching[$pos] ]]; then if [[ -n $levelpos[$pos] ]] && [[ -n $matching[$pos] ]]; then
local otherpos=$matching[$pos] local -i otherpos=$matching[$pos]
local style=cursor-matchingbracket _zsh_highlight_add_highlight $otherpos $((otherpos + 1)) cursor-matchingbracket
_zsh_highlight_add_highlight $otherpos $((otherpos + 1)) $style
fi fi
} }