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

'main': Factor out common logic to after the case/esac.

Browse Source
This commit is contained in:
Daniel Shahaf 2020-01-12 19:04:57 +00:00
parent 8feb06a022
commit 74c7ffc9b5
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -656,7 +656,6 @@ _zsh_highlight_main_highlighter_highlight_list()
local MATCH; integer MBEGIN MEND local MATCH; integer MBEGIN MEND
local parameter_name local parameter_name
local -a words local -a words
integer elision_is_happening
if [[ $arg[1] == '$' ]] && [[ ${arg[2]} == '{' ]] && [[ ${arg[-1]} == '}' ]]; then if [[ $arg[1] == '$' ]] && [[ ${arg[2]} == '{' ]] && [[ ${arg[-1]} == '}' ]]; then
parameter_name=${${arg:2}%?} parameter_name=${${arg:2}%?}
elif [[ $arg[1] == '$' ]]; then elif [[ $arg[1] == '$' ]]; then
@ -670,20 +669,18 @@ _zsh_highlight_main_highlighter_highlight_list()
case ${(tP)MATCH} in case ${(tP)MATCH} in
(*array*|*assoc*) (*array*|*assoc*)
words=( ${(P)MATCH} ) words=( ${(P)MATCH} )
elision_is_happening=$(( $#words == 0 ))
;; ;;
("") ("")
# not set # not set
words=( ) words=( )
elision_is_happening=1
;; ;;
(*) (*)
# scalar, presumably # scalar, presumably
words=( ${(P)MATCH} ) words=( ${(P)MATCH} )
elision_is_happening=$(( $#words == 0 ))
;; ;;
esac esac
if (( elision_is_happening )); then if (( $#words == 0 )); then
# Parameter elision is happening
(( ++in_redirection )) (( ++in_redirection ))
_zsh_highlight_main_add_region_highlight $start_pos $end_pos comment _zsh_highlight_main_add_region_highlight $start_pos $end_pos comment
continue continue