Skip to content

Commit 83249e1

Browse files
committed
main: Do not highlight empty region between two adjacent $()
Should fix zsh-users#624
1 parent ab4b6f5 commit 83249e1

File tree

2 files changed

+46
-1
lines changed

2 files changed

+46
-1
lines changed

highlighters/main/main-highlighter.zsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1238,7 +1238,7 @@ _zsh_highlight_main_highlighter_highlight_double_quote()
12381238
saved_reply=($reply)
12391239
reply=()
12401240
for 1 2 in $breaks; do
1241-
reply+=($1 $2 $style)
1241+
(( $1 != $2 )) && reply+=($1 $2 $style)
12421242
done
12431243
reply+=($saved_reply)
12441244
REPLY=$i
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/usr/bin/env zsh
2+
# -------------------------------------------------------------------------------------------------
3+
# Copyright (c) 2019 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+
BUFFER='echo "$(echo)$(echo)'
32+
33+
expected_region_highlight=(
34+
'1 4 builtin' # echo
35+
'6 20 default' # "$(echo)$(echo)
36+
'6 6 double-quoted-argument-unclosed' # "
37+
'7 13 command-substitution-quoted' # $(echo)
38+
'7 8 command-substitution-delimiter-quoted' # $(
39+
'9 12 builtin' # echo
40+
'13 13 command-substitution-delimiter-quoted' # )
41+
'14 20 command-substitution-quoted' # $(echo)
42+
'14 15 command-substitution-delimiter-quoted' # $(
43+
'16 19 builtin' # echo
44+
'20 20 command-substitution-delimiter-quoted' # )
45+
)

0 commit comments

Comments
 (0)