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

'main': Make sudo handling more generic.

Browse Source 
Part of issue #343.
This commit is contained in:
Daniel Shahaf 2016-07-28 07:37:59 +00:00 committed by Daniel Shahaf
parent 9c8b95171c
commit be63ff7e12
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,6 +233,16 @@ _zsh_highlight_highlighter_main_paint()
# ":" for 'then' # ":" for 'then'
local braces_stack local braces_stack
# $flags_with_argument is a set of letters, corresponding to the option letters
# that would be followed by a colon in a getopts specification.
local flags_with_argument
# $precommand_options maps precommand name to value of $flags_with_argument
# for that precommand.
local -A precommand_options
precommand_options=(
'sudo' Cgprtu
)
if [[ $zsyh_user_options[ignorebraces] == on || ${zsyh_user_options[ignoreclosebraces]:-off} == on ]]; then if [[ $zsyh_user_options[ignorebraces] == on || ${zsyh_user_options[ignoreclosebraces]:-off} == on ]]; then
local right_brace_is_recognised_everywhere=false local right_brace_is_recognised_everywhere=false
else else
@ -497,7 +507,8 @@ _zsh_highlight_highlighter_main_paint()
if [[ $this_word == *':sudo_opt:'* ]]; then if [[ $this_word == *':sudo_opt:'* ]]; then
case "$arg" in case "$arg" in
# Flag that requires an argument # Flag that requires an argument
'-'[Cgprtu]) this_word=${this_word//:start:/}; '-'[$flags_with_argument])
this_word=${this_word//:start:/};
next_word=':sudo_arg:';; next_word=':sudo_arg:';;
# This prevents misbehavior with sudo -u -otherargument # This prevents misbehavior with sudo -u -otherargument
'-'*) this_word=${this_word//:start:/}; '-'*) this_word=${this_word//:start:/};
@ -519,8 +530,9 @@ _zsh_highlight_highlighter_main_paint()
elif [[ $this_word == *':start:'* ]] && (( in_redirection == 0 )); then # $arg is the command word elif [[ $this_word == *':start:'* ]] && (( in_redirection == 0 )); then # $arg is the command word
if [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS:#"$arg"} ]]; then if [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS:#"$arg"} ]]; then
style=precommand style=precommand
elif [[ "$arg" = "sudo" ]] && { _zsh_highlight_main__type sudo; [[ -n $REPLY && $REPLY != "none" ]] }; then elif (( ${+precommand_options[$arg]} )) && { _zsh_highlight_main__type $arg; [[ -n $REPLY && $REPLY != "none" ]] }; then
style=precommand style=precommand
flags_with_argument=${precommand_options[$arg]}
next_word=${next_word//:regular:/} next_word=${next_word//:regular:/}
next_word+=':sudo_opt:' next_word+=':sudo_opt:'
next_word+=':start:' next_word+=':start:'