xinb
/
zsh-syntax-highlighting
mirror of https://github.com/zsh-users/zsh-syntax-highlighting.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bracket highlighter: simplify

This commit is contained in:
Andreas Gahr 2011-08-08 16:01:53 +02:00
parent 8375ef6e72
commit 06ad03e32c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,13 +57,13 @@ _zsh_highlight_brackets_highlighter()
["([{"]) ["([{"])
levelpos[$pos]=$((++level)) levelpos[$pos]=$((++level))
lastoflevel[$level]=$pos lastoflevel[$level]=$pos
typepos[$pos]=`_zsh_highlight_brackets_highlighter_brackettype $char` _zsh_highlight_brackets_highlighter_brackettype $char
;; ;;
[")]}"]) [")]}"])
matching[$lastoflevel[$level]]=$pos matching[$lastoflevel[$level]]=$pos
matching[$pos]=$lastoflevel[$level] matching[$pos]=$lastoflevel[$level]
levelpos[$pos]=$((level--)) levelpos[$pos]=$((level--))
typepos[$pos]=`_zsh_highlight_brackets_highlighter_brackettype $char` _zsh_highlight_brackets_highlighter_brackettype $char
;; ;;
['"'\']) ['"'\'])
# Skip everything inside quotes # Skip everything inside quotes
@ -78,14 +78,14 @@ _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 [[ -z $matching[$pos] ]] || [[ $typepos[$pos] != $typepos[$matching[$pos]] ]]; then if [[ -n $matching[$pos] ]] && [[ $typepos[$pos] == $typepos[$matching[$pos]] ]]; then
local style=$ZSH_HIGHLIGHT_STYLES[bracket-error]
region_highlight+=("$pos $((pos + 1)) $style")
else
local bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} local bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]}
local bracket_color_level=bracket-level-$(( (levelpos[$pos] - 1) % bracket_color_size + 1 )) local bracket_color_level=bracket-level-$(( (levelpos[$pos] - 1) % bracket_color_size + 1 ))
local style=$ZSH_HIGHLIGHT_STYLES[$bracket_color_level] local style=$ZSH_HIGHLIGHT_STYLES[$bracket_color_level]
region_highlight+=("$pos $((pos + 1)) $style") region_highlight+=("$pos $((pos + 1)) $style")
else
local style=$ZSH_HIGHLIGHT_STYLES[bracket-error]
region_highlight+=("$pos $((pos + 1)) $style")
fi fi
done done
@ -102,9 +102,9 @@ _zsh_highlight_brackets_highlighter()
_zsh_highlight_brackets_highlighter_brackettype() _zsh_highlight_brackets_highlighter_brackettype()
{ {
case $1 in case $1 in
["()"]) print round;; ["()"]) typepos[$pos]=round;;
["[]"]) print bracket;; ["[]"]) typepos[$pos]=bracket;;
["{}"]) print curly;; ["{}"]) typepos[$pos]=curly;;
*) ;; *) ;;
esac esac
} }