public/zsh-syntax-highlighting
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh-syntax-highlighting.git synced 2025-02-06 09:55:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't highlight backslash-escaped brackets

Browse Source
This commit is contained in:
Roland Walker 2020-11-07 15:06:10 -05:00
parent 1715f39a46
commit 66d1d202d4
2 changed files with 62 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,20 +47,29 @@ _zsh_highlight_highlighter_brackets_predicate()
_zsh_highlight_highlighter_brackets_paint() _zsh_highlight_highlighter_brackets_paint()
{ {
local char style local char style
local -i bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} buflen=${#BUFFER} level=0 matchingpos pos local -i bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} buflen=${#BUFFER} escaped_state level=0 matchingpos pos
local -A levelpos lastoflevel matching local -A levelpos lastoflevel matching
# Find all brackets and remember which one is matching # Find all brackets and remember which one is matching
pos=0 pos=0
escaped_state=0
for char in ${(s..)BUFFER} ; do for char in ${(s..)BUFFER} ; do
(( ++pos )) (( ++pos ))
if [[ $char = "\\" ]]; then
(( escaped_state = !escaped_state ))
continue
fi
case $char in case $char in
["([{"]) ["([{"])
if (( ! escaped_state )); then
levelpos[$pos]=$((++level)) levelpos[$pos]=$((++level))
lastoflevel[$level]=$pos lastoflevel[$level]=$pos
fi
;; ;;
[")]}"]) [")]}"])
if (( level > 0 )); then if (( escaped_state )); then
:
elif (( level > 0 )); then
matchingpos=$lastoflevel[$level] matchingpos=$lastoflevel[$level]
levelpos[$pos]=$((level--)) levelpos[$pos]=$((level--))
if _zsh_highlight_brackets_match $matchingpos $pos; then if _zsh_highlight_brackets_match $matchingpos $pos; then
@ -72,6 +81,7 @@ _zsh_highlight_highlighter_brackets_paint()
fi fi
;; ;;
esac esac
escaped_state=0
done done
# Now highlight all found brackets # Now highlight all found brackets

48
highlighters/brackets/test-data/escaped-brackets.zsh Normal file
View File

@ -0,0 +1,48 @@
#!/usr/bin/env zsh
# -------------------------------------------------------------------------------------------------
# Copyright (c) 2020 zsh-syntax-highlighting contributors
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification, are permitted
# provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice, this list of conditions
# and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright notice, this list of
# conditions and the following disclaimer in the documentation and/or other materials provided
# with the distribution.
# * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
# may be used to endorse or promote products derived from this software without specific prior
# written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# -------------------------------------------------------------------------------------------------
# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
# vim: ft=zsh sw=2 ts=2 et
# -------------------------------------------------------------------------------------------------
ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
ZSH_HIGHLIGHT_STYLES[bracket-level-3]=
# expect no matchingbracket highlight
ZSH_HIGHLIGHT_STYLES[cursor-matchingbracket]=
CURSOR=9 # cursor is zero-based
BUFFER='if [[ "\]" =~ "[\)\}\]]" ]]; then echo true; fi'
expected_region_highlight=(
'23 23 bracket-level-3' # ]
'4 4 bracket-level-1' # [
'5 5 bracket-level-2' # [
'26 26 bracket-level-2' # ]
'27 27 bracket-level-1' # ]
'16 16 bracket-level-3' # [
)