From 3b3a58be9114687d21f03840ebc4c53365d5e604 Mon Sep 17 00:00:00 2001 From: Antoine Catton Date: Sat, 28 Sep 2013 19:33:34 -0600 Subject: [PATCH] Fix #121: sudo syntax highlighting incorrectly Parse sudo command line in order to highlight the options correctly --- highlighters/main/main-highlighter.zsh | 23 +++++++++++- highlighters/main/test-data/sudo-command.zsh | 39 ++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 highlighters/main/test-data/sudo-command.zsh diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index f70a286..4cb4a33 100755 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -65,7 +65,7 @@ _zsh_highlight_main_highlighter() { emulate -L zsh setopt localoptions extendedglob bareglobqual - local start_pos=0 end_pos highlight_glob=true new_expression=true arg style + local start_pos=0 end_pos highlight_glob=true new_expression=true arg style sudo=false sudo_arg=false typeset -a ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR typeset -a ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS typeset -a ZSH_HIGHLIGHT_TOKENS_FOLLOWED_BY_COMMANDS @@ -75,7 +75,7 @@ _zsh_highlight_main_highlighter() '|' '||' ';' '&' '&&' ) ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS=( - 'builtin' 'command' 'exec' 'nocorrect' 'noglob' 'sudo' + 'builtin' 'command' 'exec' 'nocorrect' 'noglob' ) # Tokens that are always immediately followed by a command. ZSH_HIGHLIGHT_TOKENS_FOLLOWED_BY_COMMANDS=( @@ -88,10 +88,29 @@ _zsh_highlight_main_highlighter() [[ $start_pos -eq 0 && $arg = 'noglob' ]] && highlight_glob=false ((start_pos+=${#BUFFER[$start_pos+1,-1]}-${#${BUFFER[$start_pos+1,-1]##[[:space:]]#}})) ((end_pos=$start_pos+${#arg})) + # Parse the sudo command line + if $sudo; then + case "$arg" in + # Flag that requires an argument + '-'[Cgprtu]) sudo_arg=true;; + # This prevents misbehavior with sudo -u -otherargument + '-'*) sudo_arg=false;; + *) if $sudo_arg; then + sudo_arg=false + else + sudo=false + new_expression=true + fi + ;; + esac + fi if $new_expression; then new_expression=false if [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS:#"$arg"} ]]; then style=$ZSH_HIGHLIGHT_STYLES[precommand] + elif [[ "$arg" = "sudo" ]]; then + style=$ZSH_HIGHLIGHT_STYLES[precommand] + sudo=true else res=$(LC_ALL=C builtin type -w $arg 2>/dev/null) case $res in diff --git a/highlighters/main/test-data/sudo-command.zsh b/highlighters/main/test-data/sudo-command.zsh new file mode 100644 index 0000000..ce19f0c --- /dev/null +++ b/highlighters/main/test-data/sudo-command.zsh @@ -0,0 +1,39 @@ +#!/usr/bin/env zsh +# ------------------------------------------------------------------------------------------------- +# Copyright (c) 2010-2013 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='sudo -u otheruser ls /' + +expected_region_highlight=( + "1 4 $ZSH_HIGHLIGHT_STYLES[precommand]" # sudo + "6 7 $ZSH_HIGHLIGHT_STYLES[single-hyphen-option]" # -u + "9 17 $ZSH_HIGHLIGHT_STYLES[default]" # otheruser + "19 20 $ZSH_HIGHLIGHT_STYLES[command]" # ls + "22 22 $ZSH_HIGHLIGHT_STYLES[path]" # / +)