Skip to content

Commit 3c3555a

Browse files
m0viem0vie
committed
'main': Highlight path separators
This commit is based on the work done by Jorge Israel Peña (blaenk) in #136. Changes: * Adjusted to changes on the latest master branch. * Use regular path highlighter colors by default. * Break out early if the separator color is the same to improve performance. * Tests.
1 parent 3b67e65 commit 3c3555a

File tree

3 files changed

+110
-1
lines changed

3 files changed

+110
-1
lines changed

‎highlighters/main/main-highlighter.zsh

+18-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
: ${ZSH_HIGHLIGHT_STYLES[commandseparator]:=none}
4242
: ${ZSH_HIGHLIGHT_STYLES[hashed-command]:=fg=green}
4343
: ${ZSH_HIGHLIGHT_STYLES[path]:=underline}
44+
: ${ZSH_HIGHLIGHT_STYLES[path_pathseparator]:=${ZSH_HIGHLIGHT_STYLES[path]}}
4445
: ${ZSH_HIGHLIGHT_STYLES[path_prefix]:=underline}
46+
: ${ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]:=${ZSH_HIGHLIGHT_STYLES[path_prefix]}}
4547
: ${ZSH_HIGHLIGHT_STYLES[globbing]:=fg=blue}
4648
: ${ZSH_HIGHLIGHT_STYLES[history-expansion]:=fg=blue}
4749
: ${ZSH_HIGHLIGHT_STYLES[single-hyphen-option]:=none}
@@ -517,7 +519,10 @@ _zsh_highlight_main_highlighter()
517519
fi
518520
# if a style_override was set (eg in _zsh_highlight_main_highlighter_check_path), use it
519521
[[ -n $style_override ]] && style=$style_override
520-
(( already_added )) || _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
522+
if ! (( already_added )); then
523+
_zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
524+
[[ $style == path || $style == path_prefix ]] && _zsh_highlight_main_highlighter_highlight_path_separators
525+
fi
521526
if [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR:#"$arg"} ]]; then
522527
next_word=':start:'
523528
highlight_glob=true
@@ -546,6 +551,18 @@ _zsh_highlight_main_highlighter_check_assign()
546551
[[ $arg == [[:alpha:]_][[:alnum:]_]#(|\[*\])(|[+])=* ]]
547552
}
548553

554+
_zsh_highlight_main_highlighter_highlight_path_separators()
555+
{
556+
local pos style_pathsep
557+
style_pathsep=${style}_pathseparator
558+
[[ -z "$ZSH_HIGHLIGHT_STYLES[$style_pathsep]" || "$ZSH_HIGHLIGHT_STYLES[$style]" == "$ZSH_HIGHLIGHT_STYLES[$style_pathsep]" ]] && return 0
559+
for (( pos = start_pos; $pos <= end_pos; pos++ )) ; do
560+
if [[ $BUFFER[pos] == / ]]; then
561+
_zsh_highlight_main_add_region_highlight $((pos - 1)) $pos $style_pathsep
562+
fi
563+
done
564+
}
565+
549566
# Check if $arg is a path.
550567
_zsh_highlight_main_highlighter_check_path()
551568
{

‎highlighters/main/test-data/path-separators.zsh

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

‎highlighters/main/test-data/path-separators2.zsh

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# -------------------------------------------------------------------------------------------------
2+
# Copyright (c) 2016 zsh-syntax-highlighting contributors
3+
# All rights reserved.
4+
#
5+
# Redistribution and use in source and binary forms, with or without modification, are permitted
6+
# provided that the following conditions are met:
7+
#
8+
# * Redistributions of source code must retain the above copyright notice, this list of conditions
9+
# and the following disclaimer.
10+
# * Redistributions in binary form must reproduce the above copyright notice, this list of
11+
# conditions and the following disclaimer in the documentation and/or other materials provided
12+
# with the distribution.
13+
# * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
14+
# may be used to endorse or promote products derived from this software without specific prior
15+
# written permission.
16+
#
17+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
18+
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
19+
# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
20+
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21+
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
22+
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
23+
# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
24+
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25+
# -------------------------------------------------------------------------------------------------
26+
# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
27+
# vim: ft=zsh sw=2 ts=2 et
28+
# -------------------------------------------------------------------------------------------------
29+
30+
# ZSH_HIGHLIGHT_STYLES is empty in tests. The path-separator code however compares its values.
31+
# For this test, make sure both these styles are set and identical:
32+
ZSH_HIGHLIGHT_STYLES[path]=value
33+
ZSH_HIGHLIGHT_STYLES[path_pathseparator]=value
34+
35+
BUFFER='ls /bin/'
36+
37+
expected_region_highlight=(
38+
"4 8 path" # /bin/
39+
)

0 commit comments

Comments
 (0)