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

main: consume trailing whitespace in _highlight_list

Browse Source 
Fixes highlighting when an unclosed $( ends in whitespace.
This commit is contained in:
Matthew Martin 2018-10-20 12:37:49 -05:00
parent 48a20d067f
commit d9e326b993
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -881,7 +881,8 @@ _zsh_highlight_main_highlighter_highlight_list()
fi fi
_zsh_highlight_main_add_region_highlight $start_pos $end_pos $style _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
done done
REPLY=$(( end_pos - 1 )) [[ "$proc_buf" = (#b)(#s)(([[:space:]]|\\$'\n')#) ]]
REPLY=$(( end_pos + ${#match[1]} - 1 ))
reply=($list_highlights) reply=($list_highlights)
return $(( $#braces_stack > 0 )) return $(( $#braces_stack > 0 ))
} }

1
highlighters/main/test-data/command-substitution-unclosed.zsh
View File

@ -41,4 +41,5 @@ expected_region_highlight=(
if [[ ${(z):-'$('} == '$( ' ]]; then # ignore zsh 5.0.8 bug if [[ ${(z):-'$('} == '$( ' ]]; then # ignore zsh 5.0.8 bug
expected_region_highlight[2]='3 16 default' # foo$(echo bar expected_region_highlight[2]='3 16 default' # foo$(echo bar
expected_region_highlight[3]='6 16 command-substitution-unquoted' # $(echo bar
fi fi

1
highlighters/main/test-data/process-substitution2.zsh
View File

@ -47,4 +47,5 @@ expected_region_highlight=(
if [[ ${(z):-'$('} == '$( ' ]]; then # ignore zsh 5.0.8 bug if [[ ${(z):-'$('} == '$( ' ]]; then # ignore zsh 5.0.8 bug
expected_region_highlight[8]='17 27 default' # =(echo foo expected_region_highlight[8]='17 27 default' # =(echo foo
expected_region_highlight[9]='17 27 process-substitution' # =(echo foo
fi fi

9
highlighters/main/test-data/quoted-command-substitution-empty.zsh
View File

@ -28,16 +28,17 @@
# vim: ft=zsh sw=2 ts=2 et # vim: ft=zsh sw=2 ts=2 et
# ------------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------------
BUFFER='echo "foo$(' BUFFER='echo "foo$( '
expected_region_highlight=( expected_region_highlight=(
'1 4 builtin' # echo '1 4 builtin' # echo
'6 11 default' # "foo$( '6 12 default' # "foo$(
'6 9 double-quoted-argument-unclosed' # "foo '6 9 double-quoted-argument-unclosed' # "foo
'10 11 command-substitution-quoted' # $( '10 12 command-substitution-quoted' # $(
'10 11 command-substitution-delimiter-quoted' # $( '10 11 command-substitution-delimiter-quoted' # $(
) )
if [[ ${(z):-'$('} == '$( ' ]]; then # ignore zsh 5.0.8 bug if [[ ${(z):-'$('} == '$( ' ]]; then # ignore zsh 5.0.8 bug
expected_region_highlight[2]='6 12 default' # "foo$( expected_region_highlight[2]='6 13 default' # "foo$(
expected_region_highlight[4]='10 13 command-substitution-quoted' # $(
fi fi