From b285c7b821729bb658aa707b2b1bd120285fb29b Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Mon, 16 Nov 2015 18:44:44 +0000 Subject: [PATCH] brackets: Highlight closing ')' of array assignments correctly. (Issue #226.) Followup to c0dafd1d850e582291b41d693369794d1ea31343, which changed the highlight of those ')'s from to [reserved-word]. --- highlighters/main/main-highlighter.zsh | 20 ++++++++--- highlighters/main/test-data/assign-array.zsh | 38 ++++++++++++++++++++ highlighters/main/test-data/assign.zsh | 2 ++ 3 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 highlighters/main/test-data/assign-array.zsh diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index 64a2032..ad622b8 100644 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -89,6 +89,7 @@ _zsh_highlight_main_highlighter() emulate -L zsh setopt localoptions extendedglob bareglobqual local start_pos=0 end_pos highlight_glob=true arg style + local in_array_assignment=false # true between 'a=(' and the matching ')' typeset -a ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR typeset -a ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS typeset -a ZSH_HIGHLIGHT_TOKENS_CONTROL_FLOW @@ -171,8 +172,11 @@ _zsh_highlight_main_highlighter() # the string's color. integer already_added=0 local style_override="" - if [[ $this_word == *':start:'* ]] && [[ $arg = 'noglob' ]]; then - highlight_glob=false + if [[ $this_word == *':start:'* ]]; then + in_array_assignment=false + if [[ $arg == 'noglob' ]]; then + highlight_glob=false + fi fi # advance $start_pos, skipping over whitespace in $buf. @@ -251,7 +255,9 @@ _zsh_highlight_main_highlighter() *': hashed') style=$ZSH_HIGHLIGHT_STYLES[hashed-command];; *) if _zsh_highlight_main_highlighter_check_assign; then style=$ZSH_HIGHLIGHT_STYLES[assign] - if [[ $arg[-1] != '(' ]]; then + if [[ $arg[-1] == '(' ]]; then + in_array_assignment=true + else # assignment to a scalar parameter. # (For array assignments, the command doesn't start until the ")" token.) next_word+=':start:' @@ -299,7 +305,13 @@ _zsh_highlight_main_highlighter() fi else # $arg is a non-command word case $arg in - $'\x29') style=$ZSH_HIGHLIGHT_STYLES[reserved-word];; # subshell + $'\x29') # subshell or end of array assignment + if $in_array_assignment; then + style=$ZSH_HIGHLIGHT_STYLES[assign] + in_array_assignment=false + else + style=$ZSH_HIGHLIGHT_STYLES[reserved-word] + fi;; $'\x7d') style=$ZSH_HIGHLIGHT_STYLES[reserved-word];; # block '--'*) style=$ZSH_HIGHLIGHT_STYLES[double-hyphen-option];; '-'*) style=$ZSH_HIGHLIGHT_STYLES[single-hyphen-option];; diff --git a/highlighters/main/test-data/assign-array.zsh b/highlighters/main/test-data/assign-array.zsh new file mode 100644 index 0000000..c530fda --- /dev/null +++ b/highlighters/main/test-data/assign-array.zsh @@ -0,0 +1,38 @@ +# ------------------------------------------------------------------------------------------------- +# Copyright (c) 2015 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[assign]=$unused_highlight +BUFFER='(A=(hello world))' + +expected_region_highlight=( + "1 1 $ZSH_HIGHLIGHT_STYLES[reserved-word]" # ( + "2 4 $ZSH_HIGHLIGHT_STYLES[assign]" # A=( + "16 16 $ZSH_HIGHLIGHT_STYLES[assign]" # ) + "17 17 $ZSH_HIGHLIGHT_STYLES[reserved-word]" # ) +) diff --git a/highlighters/main/test-data/assign.zsh b/highlighters/main/test-data/assign.zsh index ef38668..7510aba 100644 --- a/highlighters/main/test-data/assign.zsh +++ b/highlighters/main/test-data/assign.zsh @@ -32,5 +32,7 @@ BUFFER='A=1 b=("foo" bar)' expected_region_highlight=( "1 3 $ZSH_HIGHLIGHT_STYLES[assign]" # A=1 + "5 7 $ZSH_HIGHLIGHT_STYLES[assign]" # b=( "8 12 $ZSH_HIGHLIGHT_STYLES[double-quoted-argument]" # "foo" + "17 17 $ZSH_HIGHLIGHT_STYLES[assign]" # ) )