Merge 436dc3d078 into 2fc57d6306
This commit is contained in:
Vladyslav
GitHub
commit
4ae8c096cc
|
|
@ -60,6 +60,9 @@ This highlighter defines the following styles:
|
|||
* `back-dollar-quoted-argument` - backslash escape sequences inside dollar-quoted arguments (`\x` in `$'\x48'`)
|
||||
* `assign` - parameter assignments (`x=foo` and `x=( )`)
|
||||
* `redirection` - redirection operators (`<`, `>`, etc)
|
||||
* `here-document` - contents of an unquoted here-document
|
||||
* `here-document-quoted` - contents of a here-document whose delimiter is quoted
|
||||
* `here-document-delimiter` - the closing delimiter of a here-document
|
||||
* `comment` - comments, when `setopt INTERACTIVE_COMMENTS` is in effect (`echo # foo`)
|
||||
* `comment` - elided parameters in command position (`$x ls` when `$x` is unset or empty)
|
||||
* `named-fd` - named file descriptor (the `fd` in `echo foo {fd}>&2`)
|
||||
|
|
|
|||
|
|
@ -59,6 +59,9 @@
|
|||
: ${ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]:=fg=cyan}
|
||||
: ${ZSH_HIGHLIGHT_STYLES[assign]:=none}
|
||||
: ${ZSH_HIGHLIGHT_STYLES[redirection]:=fg=yellow}
|
||||
: ${ZSH_HIGHLIGHT_STYLES[here-document]:=fg=yellow}
|
||||
: ${ZSH_HIGHLIGHT_STYLES[here-document-quoted]:=fg=yellow}
|
||||
: ${ZSH_HIGHLIGHT_STYLES[here-document-delimiter]:=fg=yellow}
|
||||
: ${ZSH_HIGHLIGHT_STYLES[comment]:=fg=black,bold}
|
||||
: ${ZSH_HIGHLIGHT_STYLES[named-fd]:=none}
|
||||
: ${ZSH_HIGHLIGHT_STYLES[numeric-fd]:=none}
|
||||
|
|
@ -493,6 +496,143 @@ _zsh_highlight_main_highlighter__try_expand_parameter()
|
|||
}
|
||||
}
|
||||
|
||||
# Mask here-document bodies before passing the buffer to ${(z)}. The zsh
|
||||
# lexer used by that expansion does not retain here-document state and would
|
||||
# otherwise parse body lines as commands. Keep newlines and character positions
|
||||
# unchanged so the normal highlighter can continue to calculate regions.
|
||||
#
|
||||
# Sets REPLY to the masked buffer and appends here-document regions directly
|
||||
# to list_highlights.
|
||||
_zsh_highlight_main_highlighter__mask_here_documents()
|
||||
{
|
||||
local input=$1 output='' rest=$1 line masked_line token delimiter unquoted_delimiter
|
||||
local quoted style candidate header_buffer='' quote_state='' ch prev
|
||||
local -a tokens line_tokens delimiters strip_tabs styles pending_delimiters pending_strip_tabs pending_styles
|
||||
integer line_start=0 line_length has_newline i trailing_backslashes line_continues j escaped
|
||||
|
||||
while [[ -n $rest ]]; do
|
||||
if [[ $rest == *$'\n'* ]]; then
|
||||
line=${rest%%$'\n'*}
|
||||
rest=${rest#*$'\n'}
|
||||
has_newline=1
|
||||
else
|
||||
line=$rest
|
||||
rest=''
|
||||
has_newline=0
|
||||
fi
|
||||
line_length=$#line
|
||||
masked_line=$line
|
||||
|
||||
if (( $#delimiters )); then
|
||||
candidate=$line
|
||||
(( strip_tabs[1] )) && candidate=${candidate##$'\t'#}
|
||||
style=$styles[1]
|
||||
|
||||
if [[ $candidate == $delimiters[1] ]]; then
|
||||
(( line_length )) && _zsh_highlight_main_add_region_highlight \
|
||||
$line_start $(( line_start + line_length )) here-document-delimiter
|
||||
shift delimiters strip_tabs styles
|
||||
else
|
||||
(( line_length )) && _zsh_highlight_main_add_region_highlight \
|
||||
$line_start $(( line_start + line_length )) $style
|
||||
fi
|
||||
masked_line=${(l:line_length:: :)}
|
||||
else
|
||||
header_buffer+=$line
|
||||
(( has_newline )) && header_buffer+=$'\n'
|
||||
|
||||
# Track quotes across physical lines. Tokenizing each line separately
|
||||
# would mistake << inside a multiline string for a redirection.
|
||||
escaped=0
|
||||
prev=''
|
||||
for (( j = 1; j <= line_length; ++j )); do
|
||||
ch=$line[j]
|
||||
if (( escaped )); then
|
||||
escaped=0
|
||||
prev=$ch
|
||||
continue
|
||||
fi
|
||||
case $quote_state in
|
||||
(single) [[ $ch == "'" ]] && quote_state='' ;;
|
||||
(ansi) [[ $ch == $'\\' ]] && escaped=1 || { [[ $ch == "'" ]] && quote_state=''; } ;;
|
||||
(double) [[ $ch == $'\\' ]] && escaped=1 || { [[ $ch == '"' ]] && quote_state=''; } ;;
|
||||
(backtick) [[ $ch == $'\\' ]] && escaped=1 || { [[ $ch == '`' ]] && quote_state=''; } ;;
|
||||
(*)
|
||||
if [[ $zsyh_user_options[interactivecomments] == on && $ch == '#' &&
|
||||
( j == 1 || $prev == [[:space:]\;\|\&\(\)] ) ]]; then
|
||||
break
|
||||
elif [[ $ch == "'" ]]; then
|
||||
[[ $prev == '$' ]] && quote_state=ansi || quote_state=single
|
||||
elif [[ $ch == '"' ]]; then
|
||||
quote_state=double
|
||||
elif [[ $ch == '`' ]]; then
|
||||
quote_state=backtick
|
||||
elif [[ $ch == $'\\' ]]; then
|
||||
escaped=1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
prev=$ch
|
||||
done
|
||||
|
||||
# Here-document bodies start only after the complete command line. A
|
||||
# backslash-newline or a trailing pipeline/list operator continues the
|
||||
# command header on the following physical line.
|
||||
[[ -n $quote_state ]] && line_continues=1 || line_continues=0
|
||||
if [[ $line == *$'\\' ]]; then
|
||||
trailing_backslashes=${#${line##*[^\\]}}
|
||||
(( trailing_backslashes % 2 )) && line_continues=1
|
||||
fi
|
||||
|
||||
if [[ $zsyh_user_options[interactivecomments] == on ]]; then
|
||||
line_tokens=(${(zZ+c+)line})
|
||||
tokens=(${(zZ+c+)header_buffer})
|
||||
else
|
||||
line_tokens=(${(z)line})
|
||||
tokens=(${(z)header_buffer})
|
||||
fi
|
||||
if (( $#line_tokens )); then
|
||||
[[ $line_tokens[-1] == ('|'|'|&'|'||'|'&&') ]] && line_continues=1
|
||||
fi
|
||||
|
||||
if (( ! line_continues )); then
|
||||
pending_delimiters=()
|
||||
pending_strip_tabs=()
|
||||
pending_styles=()
|
||||
for (( i = 1; i < $#tokens; ++i )); do
|
||||
token=$tokens[i]
|
||||
if [[ $token =~ '^[0-9]*<<-?$' ]]; then
|
||||
delimiter=$tokens[i+1]
|
||||
unquoted_delimiter=${(Q)delimiter}
|
||||
[[ $delimiter != $unquoted_delimiter ]]
|
||||
quoted=$?
|
||||
pending_delimiters+=($unquoted_delimiter)
|
||||
[[ $token == *'<<-' ]] && pending_strip_tabs+=(1) || pending_strip_tabs+=(0)
|
||||
(( quoted == 0 )) && pending_styles+=(here-document-quoted) || pending_styles+=(here-document)
|
||||
(( ++i ))
|
||||
fi
|
||||
done
|
||||
if (( $#pending_delimiters )); then
|
||||
delimiters+=($pending_delimiters)
|
||||
strip_tabs+=($pending_strip_tabs)
|
||||
styles+=($pending_styles)
|
||||
fi
|
||||
header_buffer=''
|
||||
fi
|
||||
fi
|
||||
|
||||
output+=$masked_line
|
||||
if (( has_newline )); then
|
||||
output+=$'\n'
|
||||
(( line_start += line_length + 1 ))
|
||||
else
|
||||
(( line_start += line_length ))
|
||||
fi
|
||||
done
|
||||
|
||||
REPLY=$output
|
||||
}
|
||||
|
||||
# $1 is the offset of $4 from the parent buffer. Added to the returned highlights.
|
||||
# $2 is the initial braces_stack (for a closing paren).
|
||||
# $3 is 1 if $4 contains the end of $BUFFER, else 0.
|
||||
|
|
@ -585,6 +725,10 @@ _zsh_highlight_main_highlighter_highlight_list()
|
|||
local this_word next_word=':start::start_of_pipeline:'
|
||||
integer in_redirection
|
||||
# Processing buffer
|
||||
if [[ $buf == *'<<'* ]]; then
|
||||
_zsh_highlight_main_highlighter__mask_here_documents "$buf"
|
||||
buf=$REPLY
|
||||
fi
|
||||
local proc_buf="$buf"
|
||||
local -a args
|
||||
if [[ $zsyh_user_options[interactivecomments] == on ]]; then
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
# -------------------------------------------------------------------------------------------------
|
||||
# Copyright (c) 2015 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=$'cat <<EOF\nhello $USER\nEOF\necho done'
|
||||
unsorted=1
|
||||
|
||||
expected_region_highlight=(
|
||||
'1 3 command' # cat
|
||||
'5 6 redirection' # <<
|
||||
'7 9 default' # EOF
|
||||
'11 21 here-document' # hello $USER
|
||||
'23 25 here-document-delimiter' # EOF
|
||||
'10 10 commandseparator' # newline
|
||||
'22 22 commandseparator' # newline
|
||||
'26 26 commandseparator' # newline
|
||||
'27 30 builtin' # echo
|
||||
'32 35 default' # done
|
||||
)
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
# -------------------------------------------------------------------------------------------------
|
||||
# Copyright (c) 2015 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=$'cat <<EOF \\\n | sed s/x/y/\nhello\nEOF'
|
||||
unsorted=1
|
||||
|
||||
expected_region_highlight=(
|
||||
'1 3 command' # cat
|
||||
'5 6 redirection' # <<
|
||||
'7 9 default' # EOF
|
||||
'15 15 commandseparator' # pipe
|
||||
'17 19 command' # sed
|
||||
'21 26 default' # s/x/y/
|
||||
'27 27 commandseparator' # newline
|
||||
'28 32 here-document' # hello
|
||||
'33 33 commandseparator' # newline
|
||||
'34 36 here-document-delimiter' # EOF
|
||||
)
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
# -------------------------------------------------------------------------------------------------
|
||||
# Copyright (c) 2015 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=$'echo "<<NO" <<YES\nbody\nYES'
|
||||
unsorted=1
|
||||
|
||||
expected_region_highlight=(
|
||||
'1 4 builtin' # echo
|
||||
'6 11 double-quoted-argument' # "<<NO"
|
||||
'6 11 default' # containing argument
|
||||
'13 14 redirection' # <<
|
||||
'15 17 default' # YES
|
||||
'19 22 here-document' # body
|
||||
'24 26 here-document-delimiter' # YES
|
||||
'18 18 commandseparator' # newline
|
||||
'23 23 commandseparator' # newline
|
||||
)
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
# -------------------------------------------------------------------------------------------------
|
||||
# Copyright (c) 2015 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=$'echo "first\n<<NOT_A_HEREDOC\nlast"\necho ok'
|
||||
|
||||
expected_region_highlight=(
|
||||
'1 4 builtin' # echo
|
||||
'6 33 default' # containing argument
|
||||
'6 33 double-quoted-argument' # multiline string
|
||||
'34 34 commandseparator' # newline
|
||||
'35 38 builtin' # echo
|
||||
'40 41 default' # ok
|
||||
)
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
# -------------------------------------------------------------------------------------------------
|
||||
# Copyright (c) 2015 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=$'diff <<LEFT <<-RIGHT\none\nLEFT\n\ttwo\n\tRIGHT'
|
||||
unsorted=1
|
||||
|
||||
expected_region_highlight=(
|
||||
'1 4 command' # diff
|
||||
'6 7 redirection' # <<
|
||||
'8 11 default' # LEFT
|
||||
'13 15 redirection' # <<-
|
||||
'16 20 default' # RIGHT
|
||||
'22 24 here-document' # one
|
||||
'26 29 here-document-delimiter' # LEFT
|
||||
'31 34 here-document' # <tab>two
|
||||
'36 41 here-document-delimiter' # <tab>RIGHT
|
||||
'21 21 commandseparator' # newline
|
||||
'25 25 commandseparator' # newline
|
||||
'30 30 commandseparator' # newline
|
||||
'35 35 commandseparator' # newline
|
||||
)
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
# -------------------------------------------------------------------------------------------------
|
||||
# Copyright (c) 2015 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=$'cat <<EOF |\n sed s/x/y/\nhello\nEOF'
|
||||
unsorted=1
|
||||
|
||||
expected_region_highlight=(
|
||||
'1 3 command' # cat
|
||||
'5 6 redirection' # <<
|
||||
'7 9 default' # EOF
|
||||
'11 11 commandseparator' # pipe
|
||||
'12 12 commandseparator' # newline
|
||||
'15 17 command' # sed
|
||||
'19 24 default' # s/x/y/
|
||||
'25 25 commandseparator' # newline
|
||||
'26 30 here-document' # hello
|
||||
'31 31 commandseparator' # newline
|
||||
'32 34 here-document-delimiter' # EOF
|
||||
)
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
# -------------------------------------------------------------------------------------------------
|
||||
# Copyright (c) 2015 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=$'cat <<\'EOF\'\nhello $USER\nEOF'
|
||||
unsorted=1
|
||||
|
||||
expected_region_highlight=(
|
||||
'1 3 command' # cat
|
||||
'5 6 redirection' # <<
|
||||
'7 11 default' # containing argument
|
||||
'7 11 single-quoted-argument' # 'EOF'
|
||||
'13 23 here-document-quoted' # hello $USER
|
||||
'25 27 here-document-delimiter' # EOF
|
||||
'12 12 commandseparator' # newline
|
||||
'24 24 commandseparator' # newline
|
||||
)
|
||||
Loading…
Reference in New Issue