From 6889ff6bd2ad9fa8ec48e89ccabaf097d47ea5b0 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Mon, 9 May 2016 03:26:06 +0000 Subject: [PATCH 1/3] 'main': Add a regression test for issue #302, "Process substitution misparsed as redirection". --- highlighters/main/test-data/redirection2.zsh | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 highlighters/main/test-data/redirection2.zsh diff --git a/highlighters/main/test-data/redirection2.zsh b/highlighters/main/test-data/redirection2.zsh new file mode 100644 index 0000000..bf5cb5a --- /dev/null +++ b/highlighters/main/test-data/redirection2.zsh @@ -0,0 +1,36 @@ +# ------------------------------------------------------------------------------------------------- +# 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='ls >(wc) | nl' + +expected_region_highlight=( + "1 2 command" # ls + "10 10 commandseparator" # | + "12 13 command 'issue #302'" # nl +) From bfabffbf975cd846a6e3098cac2a70b3ac3f8d33 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Mon, 9 May 2016 03:26:29 +0000 Subject: [PATCH 2/3] 'main': Factor out common code. No functional change. --- highlighters/main/main-highlighter.zsh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index a0f8dba..bfcd882 100644 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -93,6 +93,12 @@ _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() { + [[ $1 == (<0-9>|)(\<|\>)* ]] +} + # Main syntax highlighting function. _zsh_highlight_main_highlighter() { @@ -351,7 +357,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 )) @@ -421,7 +427,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 From fc9c892a3f1548c7c49c73e4a7d110dbb13fdfd4 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Mon, 9 May 2016 03:26:06 +0000 Subject: [PATCH 3/3] 'main': Fix issue #302, "Process substitution misparsed as redirection". --- highlighters/main/main-highlighter.zsh | 6 +++++- highlighters/main/test-data/redirection2.zsh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index bfcd882..e0de002 100644 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -96,7 +96,11 @@ _zsh_highlight_main__type() { # Check whether the first argument is a redirection operator token. # Report result via the exit code. _zsh_highlight_main__is_redirection() { - [[ $1 == (<0-9>|)(\<|\>)* ]] + # 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. diff --git a/highlighters/main/test-data/redirection2.zsh b/highlighters/main/test-data/redirection2.zsh index bf5cb5a..83f7c08 100644 --- a/highlighters/main/test-data/redirection2.zsh +++ b/highlighters/main/test-data/redirection2.zsh @@ -32,5 +32,5 @@ BUFFER='ls >(wc) | nl' expected_region_highlight=( "1 2 command" # ls "10 10 commandseparator" # | - "12 13 command 'issue #302'" # nl + "12 13 command" # nl )