xinb
/
zsh-syntax-highlighting
mirror of https://github.com/zsh-users/zsh-syntax-highlighting.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

main: Highlight unclosed backtick subshells

This commit is contained in:
Matthew Martin 2018-01-07 22:06:39 -06:00
parent 987b743646
commit d17417ec1b
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/highlighters/main.md
View File

@ -35,6 +35,7 @@ This highlighter defines the following styles:
* `single-hyphen-option` - single hyphen options (`-o`) * `single-hyphen-option` - single hyphen options (`-o`)
* `double-hyphen-option` - double hyphen options (`--option`) * `double-hyphen-option` - double hyphen options (`--option`)
* `back-quoted-argument` - backquoted expressions (`` `foo` ``) * `back-quoted-argument` - backquoted expressions (`` `foo` ``)
* `back-quoted-argument-unclosed` - unclosed backquoted expressions (`` `foo ``)
* `single-quoted-argument` - single quoted arguments (`` 'foo' ``) * `single-quoted-argument` - single quoted arguments (`` 'foo' ``)
* `single-quoted-argument-unclosed` - unclosed single quoted arguments (`` 'foo ``) * `single-quoted-argument-unclosed` - unclosed single quoted arguments (`` 'foo ``)
* `double-quoted-argument` - double quoted arguments (`` "foo" ``) * `double-quoted-argument` - double quoted arguments (`` "foo" ``)

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

@ -89,6 +89,7 @@ _zsh_highlight_main_add_region_highlight() {
single-quoted-argument{-unclosed,} single-quoted-argument{-unclosed,}
double-quoted-argument{-unclosed,} double-quoted-argument{-unclosed,}
dollar-single-quoted-argument{-unclosed,} dollar-single-quoted-argument{-unclosed,}
back-quoted-argument{-unclosed,}
) )
local needle=$1 value local needle=$1 value
while [[ -n ${value::=$fallback_of[$needle]} ]]; do while [[ -n ${value::=$fallback_of[$needle]} ]]; do
@ -681,7 +682,6 @@ _zsh_highlight_highlighter_main_paint()
;| ;|
'--'*) style=double-hyphen-option;; '--'*) style=double-hyphen-option;;
'-'*) style=single-hyphen-option;; '-'*) style=single-hyphen-option;;
'`'*) style=back-quoted-argument;;
*) if false; then *) if false; then
elif [[ $arg = $'\x7d' ]] && $right_brace_is_recognised_everywhere; then elif [[ $arg = $'\x7d' ]] && $right_brace_is_recognised_everywhere; then
# was handled by the $'\x7d' case above # was handled by the $'\x7d' case above
@ -807,6 +807,7 @@ _zsh_highlight_main_highlighter_highlight_argument()
"\\") (( i += 1 )); continue;; "\\") (( i += 1 )); continue;;
"'") _zsh_highlight_main_highlighter_highlight_single_quote $i; (( i = REPLY ));; "'") _zsh_highlight_main_highlighter_highlight_single_quote $i; (( i = REPLY ));;
'"') _zsh_highlight_main_highlighter_highlight_double_quote $i; (( i = REPLY ));; '"') _zsh_highlight_main_highlighter_highlight_double_quote $i; (( i = REPLY ));;
'`') _zsh_highlight_main_highlighter_highlight_backtick $i; (( i = REPLY ));;
'$') '$')
if [[ $arg[i+1] == "'" ]]; then if [[ $arg[i+1] == "'" ]]; then
_zsh_highlight_main_highlighter_highlight_dollar_quote $i _zsh_highlight_main_highlighter_highlight_dollar_quote $i
@ -866,7 +867,7 @@ _zsh_highlight_main_highlighter_highlight_single_quote()
else else
style=single-quoted-argument-unclosed style=single-quoted-argument-unclosed
fi fi
highlights+=($(( start_pos + $1 - 1 )) $(( start_pos + i )) $style $highlights) highlights+=($(( start_pos + arg1 - 1 )) $(( start_pos + i )) $style $highlights)
_zsh_highlight_main_add_many_region_highlights $highlights _zsh_highlight_main_add_many_region_highlights $highlights
REPLY=$i REPLY=$i
} }
@ -988,6 +989,21 @@ _zsh_highlight_main_highlighter_highlight_dollar_quote()
REPLY=$i REPLY=$i
} }
# Highlight backtick subshells
_zsh_highlight_main_highlighter_highlight_backtick()
{
local arg1=$1 i=$1 q=\` style
while i=$arg[(ib:i+1:)$q]; [[ $arg[i-1] == '\' && $i -lt $(( end_pos - start_pos )) ]]; do done
if [[ $arg[i] == '`' ]]; then
style=back-quoted-argument
else
style=back-quoted-argument-unclosed
fi
_zsh_highlight_main_add_region_highlight $(( start_pos + arg1 - 1 )) $(( start_pos + i )) $style
REPLY=$i
}
# Called with a single positional argument. # Called with a single positional argument.
# Perform filename expansion (tilde expansion) on the argument and set $REPLY to the expanded value. # Perform filename expansion (tilde expansion) on the argument and set $REPLY to the expanded value.
# #

6
highlighters/main/test-data/back-quoted-argument.zsh
View File

@ -27,8 +27,10 @@
# vim: ft=zsh sw=2 ts=2 et # vim: ft=zsh sw=2 ts=2 et
# ------------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------------
BUFFER='echo `echo 42`' # 42 is in the command position in a nested subshell.
BUFFER='echo `echo \`42\`` `echo 6 times 9'
expected_region_highlight=( expected_region_highlight=(
"6 14 back-quoted-argument" "6 18 back-quoted-argument"
"20 34 back-quoted-argument-unclosed"
) )