Skip to content

Commit 12b648e

Browse files
committed
Don't highlight backslash-escaped brackets
1 parent 1715f39 commit 12b648e

File tree

2 files changed

+62
-4
lines changed

2 files changed

+62
-4
lines changed

highlighters/brackets/brackets-highlighter.zsh

+14-4
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,29 @@ _zsh_highlight_highlighter_brackets_predicate()
4747
_zsh_highlight_highlighter_brackets_paint()
4848
{
4949
local char style
50-
local -i bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} buflen=${#BUFFER} level=0 matchingpos pos
50+
local -i bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} buflen=${#BUFFER} escaped_state level=0 matchingpos pos
5151
local -A levelpos lastoflevel matching
5252

5353
# Find all brackets and remember which one is matching
5454
pos=0
55+
escaped_state=0
5556
for char in ${(s..)BUFFER} ; do
5657
(( ++pos ))
58+
if [[ $char = "\\" ]]; then
59+
(( escaped_state = !escaped_state ))
60+
continue
61+
fi
5762
case $char in
5863
["([{"])
59-
levelpos[$pos]=$((++level))
60-
lastoflevel[$level]=$pos
64+
if (( ! escaped_state )); then
65+
levelpos[$pos]=$((++level))
66+
lastoflevel[$level]=$pos
67+
fi
6168
;;
6269
[")]}"])
63-
if (( level > 0 )); then
70+
if (( escaped_state )); then
71+
:
72+
elif (( level > 0 )); then
6473
matchingpos=$lastoflevel[$level]
6574
levelpos[$pos]=$((level--))
6675
if _zsh_highlight_brackets_match $matchingpos $pos; then
@@ -72,6 +81,7 @@ _zsh_highlight_highlighter_brackets_paint()
7281
fi
7382
;;
7483
esac
84+
escaped_state=0
7585
done
7686

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

0 commit comments

Comments
 (0)