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

dollar-double-quoted-argument: Handle «"foo$"» correctly.

Browse Source
This commit is contained in:
Daniel Shahaf 2015-09-24 18:57:56 +00:00
parent b0cc02ed86
commit 66eb801358
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,6 +272,8 @@ _zsh_highlight_main_highlighter_highlight_string()
if [[ ${arg:$i} =~ ^([A-Za-z_][A-Za-z0-9_]*|[0-9]+) ]] ; then if [[ ${arg:$i} =~ ^([A-Za-z_][A-Za-z0-9_]*|[0-9]+) ]] ; then
(( k += $#MATCH )) # highlight the parameter name (( k += $#MATCH )) # highlight the parameter name
(( i += $#MATCH )) # skip past it (( i += $#MATCH )) # skip past it
else
continue
fi fi
;; ;;
"\\") style=$ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument] "\\") style=$ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]

9
highlighters/main/test-data/double-quoted3.zsh
View File

@ -28,10 +28,11 @@
# vim: ft=zsh sw=2 ts=2 et # vim: ft=zsh sw=2 ts=2 et
# ------------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------------
BUFFER=': "$42foo"' BUFFER=': "$" "$42foo"'
expected_region_highlight=( expected_region_highlight=(
"3 3 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # " "3 5 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # "$"
"4 6 $ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]" # $42 "7 7 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # "
"7 10 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # foo" "8 10 $ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]" # $42
"11 14 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # foo"
) )