chinhwajie/zsh-syntax-highlighting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/pr/308' into HEAD

Browse Source 
* upstream/pr/308:
  'main': Fix issue #302, "Process substitution misparsed as redirection".
  'main': Factor out common code.  No functional change.
  'main': Add a regression test for issue #302, "Process substitution misparsed as redirection".
This commit is contained in:
Daniel Shahaf
2016-05-13 01:24:01 +00:00
parent 0ff354b44b fc9c892a3f
commit 4f5bb6cf96
2 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,6 +93,16 @@ _zsh_highlight_main__type() {
LC_ALL=C builtin type -w -- $1 2>/dev/null
}
# Check whether the first argument is a redirection operator token.
# Report result via the exit code.
_zsh_highlight_main__is_redirection() {
# A redirection operator token:
# - starts with an optional single-digit number;
# - then, has a '<' or '>' character;
# - is not a process substitution [<(...) or >(...)].
[[ $1 == (<0-9>|)(\<|\>)* ]] && [[ $1 != (\<|\>)$'\x28'* ]]
}
# Main syntax highlighting function.
_zsh_highlight_main_highlighter()
{
@@ -374,7 +384,7 @@ _zsh_highlight_main_highlighter()
else
style=unknown-token
fi
elif [[ $arg == (<0-9>|)(\<|\>)* ]]; then
elif _zsh_highlight_main__is_redirection $arg; then
# A '<' or '>', possibly followed by a digit
style=redirection
(( in_redirection=2 ))
@@ -444,7 +454,7 @@ _zsh_highlight_main_highlighter()
else
style=unknown-token
fi
elif [[ $arg == (<0-9>|)(\<|\>)* ]]; then
elif _zsh_highlight_main__is_redirection $arg; then
style=redirection
(( in_redirection=2 ))
else