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

Merge pull request #63 from garinger/master 

Fix for Issue #36 "Brackets of different types matched"
This commit is contained in:
Julien Nicoulaud 2011-07-21 03:45:51 -07:00
parent a18e43d059 e7ab165310
commit 8ebce17a11
1 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,39 +46,53 @@ _zsh_highlight_brackets_highlighter_predicate()
# Brackets highlighting function. # Brackets highlighting function.
_zsh_highlight_brackets_highlighter() _zsh_highlight_brackets_highlighter()
{ {
local bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} local level pos
if ((bracket_color_size > 0)); then local -A levelpos lastoflevel matching typepos
local c level pos
typeset -A levelpos lastoflevel matching revmatching
((level = 0)) ((level = 0))
for pos in {1..${#BUFFER}}; do for ((pos = 1; $pos <= ${#BUFFER}; pos++ )) ; do
case $BUFFER[pos] in case $BUFFER[pos] in
"("|"["|"{") ["([{"])
levelpos[$pos]=$((++level)) levelpos[$pos]=$((++level))
lastoflevel[$level]=$pos lastoflevel[$level]=$pos
typepos[$pos]=`_zsh_highlight_brackets_highlighter_brackettype $BUFFER[$pos]`
;; ;;
")"|"]"|"}") [")]}"])
matching[$lastoflevel[$level]]=$pos matching[$lastoflevel[$level]]=$pos
revmatching[$pos]=$lastoflevel[$level] matching[$pos]=$lastoflevel[$level]
levelpos[$pos]=$((level--)) levelpos[$pos]=$((level--))
typepos[$pos]=`_zsh_highlight_brackets_highlighter_brackettype $BUFFER[$pos]`
;;
['"'\'])
local quotetype=$BUFFER[$pos]
while (( $pos < ${#BUFFER} )) ; do
((++pos))
[[ $BUFFER[$pos] == $quotetype ]] && break
done
;; ;;
esac esac
done done
for pos in ${(k)levelpos}; do for pos in ${(k)levelpos}; do
if [[ -z $matching[$pos] ]] && [[ -z $revmatching[$pos] ]]; then if [[ -z $matching[$pos] ]] || [[ $typepos[$pos] != $typepos[$matching[$pos]] ]]; then
region_highlight+=("$((pos - 1)) $pos "$ZSH_HIGHLIGHT_STYLES[bracket-error]) region_highlight+=("$((pos - 1)) $pos "$ZSH_HIGHLIGHT_STYLES[bracket-error])
else else
local bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]}
local style=bracket-level-$(( (levelpos[$pos] - 1) % bracket_color_size + 1 )) local style=bracket-level-$(( (levelpos[$pos] - 1) % bracket_color_size + 1 ))
region_highlight+=("$((pos - 1)) $pos "$ZSH_HIGHLIGHT_STYLES[$style]) region_highlight+=("$((pos - 1)) $pos "$ZSH_HIGHLIGHT_STYLES[$style])
fi fi
done done
((c = CURSOR + 1)) ((pos = CURSOR + 1))
if [[ -n $levelpos[$c] ]]; then if [[ -n $levelpos[$pos] ]] && [[ -n $matching[$pos] ]]; then
local otherpos local otherpos=$matching[$pos]
((otherpos = -1))
[[ -n $matching[$c] ]] && otherpos=$matching[$c]
[[ -n $revmatching[$c] ]] && otherpos=$revmatching[$c]
region_highlight+=("$((otherpos - 1)) $otherpos standout") region_highlight+=("$((otherpos - 1)) $otherpos standout")
fi fi
fi }
_zsh_highlight_brackets_highlighter_brackettype()
{
case $1 in
["()"]) print round;;
["[]"]) print bracket;;
["{}"]) print curly;;
*) ;;
esac
} }