stonewareslord/zsh-syntax-highlighting
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixup! 'main': Don't match redirection operators in command substitutions as <-> number range globs. Fixes #483.

Browse Source
This commit is contained in:
Daniel Shahaf 2018-01-19 00:51:11 +00:00
parent 1c4ad6b6dc
commit e86138474e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
highlighters/main/main-highlighter.zsh
View File

@ -822,7 +822,7 @@ _zsh_highlight_main_highlighter_highlight_argument()
elif [[ $arg[i+1] == [*@#?-$!] ]]; then elif [[ $arg[i+1] == [*@#?-$!] ]]; then
(( i += 1 )) (( i += 1 ))
fi;; fi;;
[*?]*|\<[0-9]#-[0-9]#\>) [*?]*|\<[0-9]#-[0-9]#\>*)
# The '<' is for the <-> globbing syntax. (This function doesn't get called on redirection tokens.) # The '<' is for the <-> globbing syntax. (This function doesn't get called on redirection tokens.)
if $highlight_glob; then if $highlight_glob; then
_zsh_highlight_main_add_region_highlight $start_pos $end_pos globbing _zsh_highlight_main_add_region_highlight $start_pos $end_pos globbing

10
highlighters/main/test-data/number_range-glob.zsh
View File

@ -28,13 +28,13 @@
# vim: ft=zsh sw=2 ts=2 et # vim: ft=zsh sw=2 ts=2 et
# ------------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------------
BUFFER='print <-> x<-> <foo2-3>' BUFFER='print <-> x<->y <foo2-3>'
expected_region_highlight=( expected_region_highlight=(
'1 5 builtin' # print '1 5 builtin' # print
'7 9 globbing' # <-> '7 9 globbing' # <->
'11 14 globbing' # x<-> '11 15 globbing' # x<->
'16 16 redirection' # < '17 17 redirection' # <
'17 22 default' # foo2-3 (the filename) '18 23 default' # foo2-3 (the filename)
'23 23 redirection' # > '24 24 redirection' # >
) )