diff --git a/highlighters/brackets/brackets-highlighter.zsh b/highlighters/brackets/brackets-highlighter.zsh index cb09b40..2ef2386 100644 --- a/highlighters/brackets/brackets-highlighter.zsh +++ b/highlighters/brackets/brackets-highlighter.zsh @@ -70,10 +70,6 @@ _zsh_highlight_highlighter_brackets_paint() levelpos[$pos]=-1 fi ;; - ['"'\']) - # Skip everything inside quotes - pos=$BUFFER[(ib:pos+1:)$char] - ;; esac done diff --git a/highlighters/brackets/test-data/near-quotes.zsh b/highlighters/brackets/test-data/near-quotes.zsh index b7cc2cb..d3965d2 100644 --- a/highlighters/brackets/test-data/near-quotes.zsh +++ b/highlighters/brackets/test-data/near-quotes.zsh @@ -28,11 +28,16 @@ # ------------------------------------------------------------------------------------------------- ZSH_HIGHLIGHT_STYLES[bracket-level-1]= +ZSH_HIGHLIGHT_STYLES[bracket-level-2]= BUFFER=': {"{x}"}' expected_region_highlight=( "3 3 bracket-level-1" - "4 8 NONE" + "4 4 NONE" + "5 5 bracket-level-2" + "6 6 NONE" + "7 7 bracket-level-2" + "8 8 NONE" "9 9 bracket-level-1" ) diff --git a/highlighters/brackets/test-data/nested-quote.zsh b/highlighters/brackets/test-data/nested-quote.zsh deleted file mode 100644 index 8febae8..0000000 --- a/highlighters/brackets/test-data/nested-quote.zsh +++ /dev/null @@ -1,36 +0,0 @@ -# ------------------------------------------------------------------------------------------------- -# 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 -# ------------------------------------------------------------------------------------------------- - -ZSH_HIGHLIGHT_STYLES[bracket-level-1]= - -BUFFER=': "\"{x"' - -expected_region_highlight=( - "3 9 NONE 'issue #303'" -) diff --git a/highlighters/brackets/test-data/quoted-patentheses.zsh b/highlighters/brackets/test-data/quoted-patentheses.zsh index 5c3dcea..8d1e26d 100644 --- a/highlighters/brackets/test-data/quoted-patentheses.zsh +++ b/highlighters/brackets/test-data/quoted-patentheses.zsh @@ -30,5 +30,7 @@ BUFFER='echo "foo ( bar"' expected_region_highlight=( -"1 16 NONE" # We expect the brackets highlighter to do nothing +"1 10 NONE" +"11 11 bracket-error" +"12 16 NONE" )