diff --git a/highlighters/main/README.md b/highlighters/main/README.md index fff62de..3a65af3 100644 --- a/highlighters/main/README.md +++ b/highlighters/main/README.md @@ -47,6 +47,7 @@ This highlighter defines the following styles: * `back-double-quoted-argument` - back double quoted arguments (\x inside "") * `back-dollar-quoted-argument` - back dollar quoted arguments (\x inside $'') * `assign` - variable assignments +* `redirection` - redirection operators (`<`, `>`, etc) * `default` - parts of the buffer that do not match anything To override one of those styles, change its entry in `ZSH_HIGHLIGHT_STYLES`, for example in `~/.zshrc`: diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index ef42709..a71c94f 100755 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -56,6 +56,7 @@ : ${ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]:=fg=cyan} : ${ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]:=fg=cyan} : ${ZSH_HIGHLIGHT_STYLES[assign]:=none} +: ${ZSH_HIGHLIGHT_STYLES[redirection]:=none} # Whether the highlighter should be called or not. _zsh_highlight_main_highlighter_predicate() @@ -182,7 +183,7 @@ _zsh_highlight_main_highlighter() elif [[ $arg[0,1] == $histchars[0,1] || $arg[0,1] == $histchars[2,2] ]]; then style=$ZSH_HIGHLIGHT_STYLES[history-expansion] elif [[ $arg[1] == '<' || $arg[1] == '>' ]]; then - style=$ZSH_HIGHLIGHT_STYLE[redirection] + style=$ZSH_HIGHLIGHT_STYLES[redirection] redirection=true else style=$ZSH_HIGHLIGHT_STYLES[unknown-token] @@ -217,6 +218,8 @@ _zsh_highlight_main_highlighter() style=$ZSH_HIGHLIGHT_STYLES[history-expansion] elif [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR:#"$arg"} ]]; then style=$ZSH_HIGHLIGHT_STYLES[commandseparator] + elif [[ $arg[1] == '<' || $arg[1] == '>' ]]; then + style=$ZSH_HIGHLIGHT_STYLES[redirection] else style=$ZSH_HIGHLIGHT_STYLES[default] fi diff --git a/highlighters/main/test-data/redirection.zsh b/highlighters/main/test-data/redirection.zsh new file mode 100644 index 0000000..0a01d55 --- /dev/null +++ b/highlighters/main/test-data/redirection.zsh @@ -0,0 +1,38 @@ +#!/usr/bin/env zsh +# ------------------------------------------------------------------------------------------------- +# 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 +# ------------------------------------------------------------------------------------------------- + +# Redirection before and after the command word are implemented differently; test both. +ZSH_HIGHLIGHT_STYLES[redirection]=$unused_highlight +BUFFER='<<>&!bar' + +expected_region_highlight=( + "1 3 $ZSH_HIGHLIGHT_STYLES[redirection]" # <<< + "13 16 $ZSH_HIGHLIGHT_STYLES[redirection]" # >>&! +)