mirror of
https://github.com/zsh-users/zsh-syntax-highlighting.git
synced 2025-01-30 09:47:13 +08:00
* optimize discrimination of bracket-type
* use a nicer variable name
This commit is contained in:
parent
f1eb5aeef7
commit
e7ab165310
@ -54,28 +54,23 @@ _zsh_highlight_brackets_highlighter()
|
|||||||
["([{"])
|
["([{"])
|
||||||
levelpos[$pos]=$((++level))
|
levelpos[$pos]=$((++level))
|
||||||
lastoflevel[$level]=$pos
|
lastoflevel[$level]=$pos
|
||||||
typepos[$pos]=$BUFFER[$pos]
|
typepos[$pos]=`_zsh_highlight_brackets_highlighter_brackettype $BUFFER[$pos]`
|
||||||
;;
|
;;
|
||||||
[")]}"])
|
[")]}"])
|
||||||
matching[$lastoflevel[$level]]=$pos
|
matching[$lastoflevel[$level]]=$pos
|
||||||
matching[$pos]=$lastoflevel[$level]
|
matching[$pos]=$lastoflevel[$level]
|
||||||
levelpos[$pos]=$((level--))
|
levelpos[$pos]=$((level--))
|
||||||
typepos[$pos]=$BUFFER[$pos]
|
typepos[$pos]=`_zsh_highlight_brackets_highlighter_brackettype $BUFFER[$pos]`
|
||||||
;;
|
;;
|
||||||
['"'\'])
|
['"'\'])
|
||||||
local temp=$BUFFER[$pos]
|
local quotetype=$BUFFER[$pos]
|
||||||
while (( $pos < ${#BUFFER} )) ; do
|
while (( $pos < ${#BUFFER} )) ; do
|
||||||
((++pos))
|
((++pos))
|
||||||
[[ $BUFFER[$pos] == $temp ]] && break
|
[[ $BUFFER[$pos] == $quotetype ]] && break
|
||||||
done
|
done
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
for pos in ${(k)typepos}; do
|
|
||||||
typepos[$pos]=${typepos[${pos}]/["()"]/round}
|
|
||||||
typepos[$pos]=${typepos[${pos}]/["[]"]/square}
|
|
||||||
typepos[$pos]=${typepos[${pos}]/["{}"]/curly}
|
|
||||||
done
|
|
||||||
for pos in ${(k)levelpos}; do
|
for pos in ${(k)levelpos}; do
|
||||||
if [[ -z $matching[$pos] ]] || [[ $typepos[$pos] != $typepos[$matching[$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])
|
||||||
@ -91,3 +86,13 @@ _zsh_highlight_brackets_highlighter()
|
|||||||
region_highlight+=("$((otherpos - 1)) $otherpos standout")
|
region_highlight+=("$((otherpos - 1)) $otherpos standout")
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_zsh_highlight_brackets_highlighter_brackettype()
|
||||||
|
{
|
||||||
|
case $1 in
|
||||||
|
["()"]) print round;;
|
||||||
|
["[]"]) print bracket;;
|
||||||
|
["{}"]) print curly;;
|
||||||
|
*) ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user