ylib/zsh-syntax-highlighting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'main': Highlight array parameters in command position.

Browse Source
This commit is contained in:
Daniel Shahaf 2018-01-12 13:54:02 +00:00 committed by Matthew Martin
parent ad6261fbca
commit 31ceaed4f4
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -553,7 +553,17 @@ _zsh_highlight_main_highlighter_highlight_list()
[[ ${parameter_name} =~ ^([A-Za-z_][A-Za-z0-9_]*|[0-9]+)$ ]] && [[ ${parameter_name} =~ ^([A-Za-z_][A-Za-z0-9_]*|[0-9]+)$ ]] &&
(( ${+parameters[(e)${MATCH}]} )) && [[ ${parameters[(e)$MATCH]} != *special* ]] (( ${+parameters[(e)${MATCH}]} )) && [[ ${parameters[(e)$MATCH]} != *special* ]]
then then
arg=${(P)MATCH} # Set $arg.
case ${(tP)MATCH} in
(*array*|*assoc*)
local -a words; words=( ${(P)MATCH} )
arg=${words[1]}
;;
(*)
# scalar, presumably
arg=${(P)MATCH}
;;
esac
_zsh_highlight_main__type "$arg" _zsh_highlight_main__type "$arg"
res=$REPLY res=$REPLY
fi fi

5
highlighters/main/test-data/commmand-parameter.zsh
View File

@ -29,9 +29,10 @@
local x=/usr/bin/env local x=/usr/bin/env
local y=sudo local y=sudo
local -a z; z=(zsh -f)
sudo(){} sudo(){}
BUFFER='$x "argument"; $y' BUFFER='$x "argument"; $y; $z'
expected_region_highlight=( expected_region_highlight=(
"1 2 command" # $x "1 2 command" # $x
@ -39,4 +40,6 @@ expected_region_highlight=(
"4 13 double-quoted-argument" # "argument" "4 13 double-quoted-argument" # "argument"
"14 14 commandseparator" # ; "14 14 commandseparator" # ;
"16 17 precommand" # $y (sudo) "16 17 precommand" # $y (sudo)
"18 18 unknown-token" # ;
"20 21 command" # $z - 'zsh' being the command
) )