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

main: Simplify this_word next_word updating

Browse Source
This commit is contained in:
Matthew Martin 2018-03-25 21:44:39 -05:00
parent c05ebf762c
commit de28e20fbc
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,7 +384,7 @@ _zsh_highlight_main_highlighter_highlight_list()
# $in_redirection. The value of $next_word from the iteration that processed # $in_redirection. The value of $next_word from the iteration that processed
# the operator is discarded. # the operator is discarded.
# #
local this_word=':start:' next_word local this_word next_word=':start:'
integer in_redirection integer in_redirection
# Processing buffer # Processing buffer
local proc_buf="$buf" local proc_buf="$buf"
@ -398,15 +398,13 @@ _zsh_highlight_main_highlighter_highlight_list()
# Save an unmunged copy of the current word. # Save an unmunged copy of the current word.
arg_raw="$arg" arg_raw="$arg"
# Initialize $next_word. # Initialize this_word and next_word.
if (( in_redirection )); then
(( --in_redirection ))
fi
if (( in_redirection == 0 )); then if (( in_redirection == 0 )); then
# Initialize $next_word to its default value. this_word=$next_word
next_word=':regular:' next_word=':regular:'
else else
# Stall $next_word. # Stall $next_word.
(( --in_redirection ))
fi fi
# Initialize per-"simple command" [zshmisc(1)] variables: # Initialize per-"simple command" [zshmisc(1)] variables:
@ -493,7 +491,8 @@ _zsh_highlight_main_highlighter_highlight_list()
style=unknown-token # prematurely terminated style=unknown-token # prematurely terminated
fi fi
_zsh_highlight_main_add_region_highlight $start_pos $end_pos $style _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
already_added=1 # Stall this arg
in_redirection=1
start_pos=$end_pos start_pos=$end_pos
continue continue
fi fi
@ -864,12 +863,6 @@ _zsh_highlight_main_highlighter_highlight_list()
next_word=':start:' next_word=':start:'
fi fi
start_pos=$end_pos start_pos=$end_pos
if (( in_redirection == 0 )); then
# This is the default/common codepath.
this_word=$next_word
else
# Stall $this_word.
fi
done done
REPLY=$(( end_pos - 1 )) REPLY=$(( end_pos - 1 ))
reply=($list_highlights) reply=($list_highlights)