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 mismatched do/done.

This commit is contained in:
Daniel Shahaf 2016-09-25 09:20:40 +00:00
parent 2755438e80
commit b2733a64da
2 changed files with 63 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,7 +214,11 @@ _zsh_highlight_highlighter_main_paint()
integer len="${#buf}" integer len="${#buf}"
integer pure_buf_len=$(( len - ${#PREBUFFER} )) # == $#BUFFER, used e.g. in *_check_path integer pure_buf_len=$(( len - ${#PREBUFFER} )) # == $#BUFFER, used e.g. in *_check_path
local braces_stack # "R" for round, "Q" for square, "Y" for curly # "R" for round
# "Q" for square
# "Y" for curly
# "D" for do/done
local braces_stack
if (( path_dirs_was_set )); then if (( path_dirs_was_set )); then
options_to_set+=( PATH_DIRS ) options_to_set+=( PATH_DIRS )
@ -447,15 +451,24 @@ _zsh_highlight_highlighter_main_paint()
case $res in case $res in
reserved) # reserved word reserved) # reserved word
style=reserved-word style=reserved-word
if [[ $arg == $'\x7b' ]]; then case $arg in
braces_stack='Y'"$braces_stack" ($'\x7b')
elif [[ $arg == $'\x7d' ]]; then braces_stack='Y'"$braces_stack"
# We're at command word, so no need to check $right_brace_is_recognised_everywhere ;;
_zsh_highlight_main__stack_pop 'Y' style=reserved-word ($'\x7d')
if [[ $style == reserved-word ]]; then # We're at command word, so no need to check $right_brace_is_recognised_everywhere
next_word+=':always:' _zsh_highlight_main__stack_pop 'Y' style=reserved-word
fi if [[ $style == reserved-word ]]; then
fi next_word+=':always:'
fi
;;
('do')
braces_stack='D'"$braces_stack"
;;
('done')
_zsh_highlight_main__stack_pop 'D' style=reserved-word
;;
esac
;; ;;
'suffix alias') style=suffix-alias;; 'suffix alias') style=suffix-alias;;
alias) () { alias) () {

40
highlighters/main/test-data/brackets-mismatch6.zsh Normal file
View File

@ -0,0 +1,40 @@
#!/usr/bin/env zsh
# -------------------------------------------------------------------------------------------------
# Copyright (c) 2016 zsh-syntax-highlighting contributors
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification, are permitted
# provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice, this list of conditions
# and the following disclaimer.
# * Redistributions in binary form must reproduce the above copyright notice, this list of
# conditions and the following disclaimer in the documentation and/or other materials provided
# with the distribution.
# * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
# may be used to endorse or promote products derived from this software without specific prior
# written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# -------------------------------------------------------------------------------------------------
# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
# vim: ft=zsh sw=2 ts=2 et
# -------------------------------------------------------------------------------------------------
BUFFER='(repeat 1; do)'
expected_region_highlight=(
'1 1 reserved-word' # (
'2 7 reserved-word' # repeat
'9 9 default' # 1
'10 10 commandseparator' # ;
'12 13 reserved-word' # do
'14 14 unknown-token' # )
)