From c6f62dd69f19cf7e44a01319183c0d7aeab5f1cf Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Tue, 1 Sep 2020 14:32:59 +0200 Subject: [PATCH] Perf: add ambiguous-hashed-command.zsh --- highlighters/main/main-highlighter.zsh | 2 + .../test-data/ambiguous-hashed-command.zsh | 41 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 highlighters/main/test-data/ambiguous-hashed-command.zsh diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh index f738b6e..628b850 100644 --- a/highlighters/main/main-highlighter.zsh +++ b/highlighters/main/main-highlighter.zsh @@ -173,6 +173,8 @@ _zsh_highlight_main__type() { # # % hash zsh=$commands[zsh] # % zsh # <-- here the type of `zsh` is "command" rather than "hashed" + # + # See highlighters/main/test-data/ambiguous-hashed-command.zsh. if [[ $cmd == /(|*/)$1 && $path[(Ie)${cmd:h}] != 0 ]]; then REPLY=command else diff --git a/highlighters/main/test-data/ambiguous-hashed-command.zsh b/highlighters/main/test-data/ambiguous-hashed-command.zsh new file mode 100644 index 0000000..e560009 --- /dev/null +++ b/highlighters/main/test-data/ambiguous-hashed-command.zsh @@ -0,0 +1,41 @@ +# ------------------------------------------------------------------------------------------------- +# 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 +# ------------------------------------------------------------------------------------------------- + +hash sh=/bin/sh +BUFFER='sh' + +if zmodload -e zsh/parameter; then + expected_region_highlight=( + "1 2 hashed-command 'hashed command found in PATH classified as plain command'" + ) +else + expected_region_highlight=( + "1 2 hashed-command" + ) +fi