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

main: Only highlight one base_style in _highlight_arguments

Browse Source 
Closes #481
This commit is contained in:
Matthew Martin 2018-01-18 15:01:06 -06:00
parent 6835121eaf
commit c1a048a084
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -799,14 +799,13 @@ _zsh_highlight_main_highlighter_check_path()
# This command will at least highlight start_pos to end_pos with the default style # This command will at least highlight start_pos to end_pos with the default style
_zsh_highlight_main_highlighter_highlight_argument() _zsh_highlight_main_highlighter_highlight_argument()
{ {
local i path_eligible style local base_style=default i path_eligible style
local -a highlights reply local -a highlights reply
path_eligible=1 path_eligible=1
local -a match mbegin mend local -a match mbegin mend
local MATCH; integer MBEGIN MEND local MATCH; integer MBEGIN MEND
_zsh_highlight_main_add_region_highlight $start_pos $end_pos default
for (( i = 1 ; i <= end_pos - start_pos ; i += 1 )); do for (( i = 1 ; i <= end_pos - start_pos ; i += 1 )); do
case "$arg[$i]" in case "$arg[$i]" in
"\\") (( i += 1 )); continue;; "\\") (( i += 1 )); continue;;
@ -843,7 +842,7 @@ _zsh_highlight_main_highlighter_highlight_argument()
*) *)
if $highlight_glob && [[ ${arg[$i]} == [*?] || ${arg:$i-1} == \<[0-9]#-[0-9]#\>* ]]; then if $highlight_glob && [[ ${arg[$i]} == [*?] || ${arg:$i-1} == \<[0-9]#-[0-9]#\>* ]]; then
(( i += $#MATCH - 1 )) (( i += $#MATCH - 1 ))
_zsh_highlight_main_add_region_highlight $start_pos $end_pos globbing base_style=globbing
path_eligible=0 path_eligible=0
break break
else else
@ -854,11 +853,12 @@ _zsh_highlight_main_highlighter_highlight_argument()
done done
if (( path_eligible )) && _zsh_highlight_main_highlighter_check_path; then if (( path_eligible )) && _zsh_highlight_main_highlighter_check_path; then
style=$REPLY base_style=$REPLY
_zsh_highlight_main_add_region_highlight $start_pos $end_pos $style _zsh_highlight_main_highlighter_highlight_path_separators $base_style
highlights+=($reply) highlights+=($reply)
fi fi
highlights=($start_pos $end_pos $base_style $highlights)
_zsh_highlight_main_add_many_region_highlights $highlights _zsh_highlight_main_add_many_region_highlights $highlights
} }