From b0cc02ed86e3586ab92cc1082fb97b94cd5f584f Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Thu, 17 Sep 2015 20:07:37 +0000 Subject: [PATCH 1/2] dollar-double-quoted-argument: Highlight "$foo" better. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now, «"$42foo"» doesn't highlight the «foo», and «"$bar» highlights the «r». --- highlighters/main/main-highlighter.zsh | 15 ++++---- .../main/test-data/double-quoted2.zsh | 37 +++++++++++++++++++ .../main/test-data/double-quoted3.zsh | 37 +++++++++++++++++++ 3 files changed, 81 insertions(+), 8 deletions(-) create mode 100644 highlighters/main/test-data/double-quoted2.zsh create mode 100644 highlighters/main/test-data/double-quoted3.zsh diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index dec467a..4aca3a9 100755 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -260,7 +260,7 @@ _zsh_highlight_main_highlighter_check_path() _zsh_highlight_main_highlighter_highlight_string() { setopt localoptions noksharrays - local i j k style varflag + local i j k style local AA # Starting quote is at 1, so start parsing at offset 2 in the string. for (( i = 2 ; i < end_pos - start_pos ; i += 1 )) ; do @@ -268,7 +268,11 @@ _zsh_highlight_main_highlighter_highlight_string() (( k = j + 1 )) case "$arg[$i]" in '$' ) style=$ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument] - (( varflag = 1)) + # Look for an alphanumeric parameter name. + if [[ ${arg:$i} =~ ^([A-Za-z_][A-Za-z0-9_]*|[0-9]+) ]] ; then + (( k += $#MATCH )) # highlight the parameter name + (( i += $#MATCH )) # skip past it + fi ;; "\\") style=$ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument] for (( c = i + 1 ; c < end_pos - start_pos ; c += 1 )); do @@ -283,13 +287,8 @@ _zsh_highlight_main_highlighter_highlight_string() (( k += 1 )) # Color following char too. (( i += 1 )) # Skip parsing the escaped char. fi - (( varflag = 0 )) # End of variable ;; - ([^a-zA-Z0-9_])) - (( varflag = 0 )) # End of variable - continue - ;; - *) [[ $varflag -eq 0 ]] && continue ;; + *) continue ;; esac _zsh_highlight_main_add_region_highlight $j $k $style diff --git a/highlighters/main/test-data/double-quoted2.zsh b/highlighters/main/test-data/double-quoted2.zsh new file mode 100644 index 0000000..e596c6d --- /dev/null +++ b/highlighters/main/test-data/double-quoted2.zsh @@ -0,0 +1,37 @@ +#!/usr/bin/env zsh +# ------------------------------------------------------------------------------------------------- +# Copyright (c) 2010-2011 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 +# ------------------------------------------------------------------------------------------------- + +# This test checks that the 'r' gets highlighted correctly. Do not append to the BUFFER. +BUFFER=': "foo$bar' + +expected_region_highlight=( + "3 6 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # "foo + "7 10 $ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]" # $bar +) diff --git a/highlighters/main/test-data/double-quoted3.zsh b/highlighters/main/test-data/double-quoted3.zsh new file mode 100644 index 0000000..919bf08 --- /dev/null +++ b/highlighters/main/test-data/double-quoted3.zsh @@ -0,0 +1,37 @@ +#!/usr/bin/env zsh +# ------------------------------------------------------------------------------------------------- +# Copyright (c) 2010-2011 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=': "$42foo"' + +expected_region_highlight=( + "3 3 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # " + "4 6 $ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]" # $42 + "7 10 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # foo" +) From 66eb801358b1a38cb268856b7ddfbddf8b71ba6c Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Thu, 24 Sep 2015 18:57:56 +0000 Subject: [PATCH 2/2] =?UTF-8?q?dollar-double-quoted-argument:=20Handle=20?= =?UTF-8?q?=C2=AB"foo$"=C2=BB=20correctly.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- highlighters/main/main-highlighter.zsh | 2 ++ highlighters/main/test-data/double-quoted3.zsh | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index 4aca3a9..da27158 100755 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -272,6 +272,8 @@ _zsh_highlight_main_highlighter_highlight_string() if [[ ${arg:$i} =~ ^([A-Za-z_][A-Za-z0-9_]*|[0-9]+) ]] ; then (( k += $#MATCH )) # highlight the parameter name (( i += $#MATCH )) # skip past it + else + continue fi ;; "\\") style=$ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument] diff --git a/highlighters/main/test-data/double-quoted3.zsh b/highlighters/main/test-data/double-quoted3.zsh index 919bf08..4a91c85 100644 --- a/highlighters/main/test-data/double-quoted3.zsh +++ b/highlighters/main/test-data/double-quoted3.zsh @@ -28,10 +28,11 @@ # vim: ft=zsh sw=2 ts=2 et # ------------------------------------------------------------------------------------------------- -BUFFER=': "$42foo"' +BUFFER=': "$" "$42foo"' expected_region_highlight=( - "3 3 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # " - "4 6 $ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]" # $42 - "7 10 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # foo" + "3 5 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # "$" + "7 7 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # " + "8 10 $ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]" # $42 + "11 14 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # foo" )