From 4832f18c50a53b6e008253847a5e70c42e51afb9 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Fri, 13 May 2016 02:50:17 +0000 Subject: [PATCH 1/3] =?UTF-8?q?tests:=20New=20test=20for=20issue=20#290,?= =?UTF-8?q?=20=C2=ABMishighlights=20"longloops"=20'repeat'=C2=BB.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- highlighters/main/test-data/control-flow2.zsh | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 highlighters/main/test-data/control-flow2.zsh diff --git a/highlighters/main/test-data/control-flow2.zsh b/highlighters/main/test-data/control-flow2.zsh new file mode 100644 index 0000000..3871adb --- /dev/null +++ b/highlighters/main/test-data/control-flow2.zsh @@ -0,0 +1,40 @@ +# ------------------------------------------------------------------------------------------------- +# 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 42; do ls; done' + +expected_region_highlight+=( + "1 6 reserved-word" # repeat + "8 9 default" # 42 + "10 10 commandseparator 'issue #290'" # ; + "12 13 reserved-word" # do + "15 16 command" # ls + "17 17 commandseparator" # ; + "19 22 reserved-word" # done +) From ef68f50c048fd7d7ce54b76774a86f6719f4ed21 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Fri, 13 May 2016 02:50:17 +0000 Subject: [PATCH 2/3] =?UTF-8?q?'main':=20Fix=20issue=20#290,=20=C2=ABMishi?= =?UTF-8?q?ghlights=20"longloops"=20'repeat'=C2=BB.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- highlighters/main/main-highlighter.zsh | 5 ++++- highlighters/main/test-data/control-flow2.zsh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index cb7e55c..92ddda1 100644 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -497,8 +497,11 @@ _zsh_highlight_main_highlighter() # The redirection mechanism assumes $this_word describes the word # following the redirection. Make it so. # + # That word can be a command word with shortloops (`repeat 2 ls`) + # or a command separator (`repeat 2; ls` or `repeat 2; do ls; done`). + # # The repeat-count word will be handled like a redirection target. - this_word=':start:' + this_word=':start::regular:' fi start_pos=$end_pos (( in_redirection == 0 )) && this_word=$next_word diff --git a/highlighters/main/test-data/control-flow2.zsh b/highlighters/main/test-data/control-flow2.zsh index 3871adb..acf99e1 100644 --- a/highlighters/main/test-data/control-flow2.zsh +++ b/highlighters/main/test-data/control-flow2.zsh @@ -32,7 +32,7 @@ BUFFER='repeat 42; do ls; done' expected_region_highlight+=( "1 6 reserved-word" # repeat "8 9 default" # 42 - "10 10 commandseparator 'issue #290'" # ; + "10 10 commandseparator" # ; "12 13 reserved-word" # do "15 16 command" # ls "17 17 commandseparator" # ; From 6362c757b6f769215e17f60b83d4894146ae6d0e Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Fri, 13 May 2016 04:28:30 +0000 Subject: [PATCH 3/3] tests: Extend issue #290 test with another variant. The test being extended is highlighters/main/test-data/control-flow2.zsh. --- highlighters/main/test-data/control-flow3.zsh | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 highlighters/main/test-data/control-flow3.zsh diff --git a/highlighters/main/test-data/control-flow3.zsh b/highlighters/main/test-data/control-flow3.zsh new file mode 100644 index 0000000..58f507f --- /dev/null +++ b/highlighters/main/test-data/control-flow3.zsh @@ -0,0 +1,39 @@ +# ------------------------------------------------------------------------------------------------- +# 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 42; ls; pwd' + +expected_region_highlight+=( + "1 6 reserved-word" # repeat + "8 9 default" # 42 + "10 10 commandseparator" # ; + "12 13 command" # ls + "14 14 commandseparator" # ; + "16 18 builtin" # pwd +)