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

'main': Support the IGNORE_BRACES option.

Browse Source 
This is related to a future "unbalanced { ( ) }" check for issue #344.
This commit is contained in:
Daniel Shahaf 2016-09-22 03:38:34 +00:00
parent a8a6384356
commit 02807f1826
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,6 +162,11 @@ _zsh_highlight_highlighter_main_paint()
if [[ -o interactive_comments ]]; then if [[ -o interactive_comments ]]; then
local interactive_comments= # set to empty local interactive_comments= # set to empty
fi fi
if [[ -o ignore_braces ]] || [[ -o ignore_close_braces ]]; then
local right_brace_is_recognised_everywhere=false
else
local right_brace_is_recognised_everywhere=true
fi
if [[ -o path_dirs ]]; then if [[ -o path_dirs ]]; then
integer path_dirs_was_set=1 integer path_dirs_was_set=1
else else
@ -513,7 +518,18 @@ _zsh_highlight_highlighter_main_paint()
else else
style=reserved-word style=reserved-word
fi;; fi;;
$'\x7d') style=reserved-word;; # block $'\x7d') # right brace
#
# Parsing rule: # {
#
# Additionally, `tt(})' is recognized in any position if neither the
# tt(IGNORE_BRACES) option nor the tt(IGNORE_CLOSE_BRACES) option is set."""
if $right_brace_is_recognised_everywhere; then
style=reserved-word
else
# Fall through to the catchall case at the end.
fi
;|
'--'*) style=double-hyphen-option;; '--'*) style=double-hyphen-option;;
'-'*) style=single-hyphen-option;; '-'*) style=single-hyphen-option;;
"'"*) style=single-quoted-argument;; "'"*) style=single-quoted-argument;;
@ -531,6 +547,8 @@ _zsh_highlight_highlighter_main_paint()
[*?]*|*[^\\][*?]*) [*?]*|*[^\\][*?]*)
$highlight_glob && style=globbing || style=default;; $highlight_glob && style=globbing || style=default;;
*) if false; then *) if false; then
elif [[ $arg = $'\x7d' ]] && $right_brace_is_recognised_everywhere; then
# was handled by the $'\x7d' case above
elif [[ $arg[0,1] = $histchars[0,1] ]] && (( $#arg[0,2] == 2 )); then elif [[ $arg[0,1] = $histchars[0,1] ]] && (( $#arg[0,2] == 2 )); then
style=history-expansion style=history-expansion
elif [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR:#"$arg"} ]]; then elif [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR:#"$arg"} ]]; then

2
highlighters/main/test-data/braces2.zsh
View File

@ -36,7 +36,7 @@ expected_region_highlight=(
'1 2 reserved-word' # () '1 2 reserved-word' # ()
'4 4 reserved-word' # { '4 4 reserved-word' # {
'6 9 builtin' # echo '6 9 builtin' # echo
'11 11 default "ignore_braces; fixed by next commit"' # } '11 11 default' # }
'12 12 commandseparator' # \n '12 12 commandseparator' # \n
'13 13 reserved-word' # } '13 13 reserved-word' # }
) )