Skip to content

Commit 987b743

Browse files
committed
'main': Fix highlighting of «<->»-style numeric globs.
Found-by: Matthew Martin
1 parent df0f448 commit 987b743

File tree

2 files changed

+44
-2
lines changed

2 files changed

+44
-2
lines changed

highlighters/main/main-highlighter.zsh

+4-2
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,8 @@ _zsh_highlight_main__is_redirection() {
173173
# - starts with an optional single-digit number;
174174
# - then, has a '<' or '>' character;
175175
# - is not a process substitution [<(...) or >(...)].
176-
[[ $1 == (<0-9>|)(\<|\>)* ]] && [[ $1 != (\<|\>)$'\x28'* ]]
176+
# - is not a numeric glob <->
177+
[[ $1 == (<0-9>|)(\<|\>)* ]] && [[ $1 != (\<|\>)$'\x28'* ]] && [[ $1 != *'<'*'-'*'>'* ]]
177178
}
178179

179180
# Resolve alias.
@@ -820,7 +821,8 @@ _zsh_highlight_main_highlighter_highlight_argument()
820821
elif [[ $arg[i+1] == [*@#?-$!] ]]; then
821822
(( i += 1 ))
822823
fi;;
823-
[*?])
824+
[*?]|\<)
825+
# The '<' is for the <-> globbing syntax. (This function doesn't get called on redirection tokens.)
824826
if $highlight_glob; then
825827
_zsh_highlight_main_add_region_highlight $start_pos $end_pos globbing
826828
path_eligible=0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#!/usr/bin/env zsh
2+
# -------------------------------------------------------------------------------------------------
3+
# Copyright (c) 2017 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='print <-> x<-> <foo2-3>'
32+
33+
expected_region_highlight=(
34+
'1 5 builtin' # print
35+
'7 9 globbing' # <->
36+
'11 14 globbing' # x<->
37+
'16 16 redirection' # <
38+
'17 22 default' # foo2-3 (the filename)
39+
'23 23 redirection' # >
40+
)

0 commit comments

Comments
 (0)