mirror of
https://github.com/zsh-users/zsh-syntax-highlighting.git
synced 2025-04-17 11:35:32 +08:00
Perf: identify newly installed commands as commands
This commit is contained in:
parent
1b8f49ac5b
commit
19bc5332a6
@ -170,9 +170,17 @@ _zsh_highlight_main__type() {
|
|||||||
# ZSH_VERSION >= 5.1 allows the use of #q. ZSH_VERSION <= 5.8 allows skipping
|
# ZSH_VERSION >= 5.1 allows the use of #q. ZSH_VERSION <= 5.8 allows skipping
|
||||||
# 'type -w' calls that are necessary for forward compatibility.
|
# 'type -w' calls that are necessary for forward compatibility.
|
||||||
elif [[ $ZSH_VERSION == 5.<1-8>(|.*) ]]; then
|
elif [[ $ZSH_VERSION == 5.<1-8>(|.*) ]]; then
|
||||||
if [[ -n $1(#qN-.*) ||
|
if [[ $1 == */* && -n $1(#qN-.*) ||
|
||||||
$1 == [^/]*/* && $zsyh_user_options[pathdirs] == on && -n ${^path}/$1(#q-N.*) ]]; then
|
$1 == [^/]*/* && $zsyh_user_options[pathdirs] == on && -n ${^path}/$1(#q-N.*) ]]; then
|
||||||
REPLY=command
|
REPLY=command
|
||||||
|
elif (( _zsh_highlight_main__rehash )); then
|
||||||
|
builtin rehash
|
||||||
|
_zsh_highlight_main__rehash=0
|
||||||
|
if (( $+commands[$1] )); then
|
||||||
|
REPLY=command
|
||||||
|
else
|
||||||
|
REPLY=none
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
REPLY=none
|
REPLY=none
|
||||||
fi
|
fi
|
||||||
@ -1135,7 +1143,7 @@ _zsh_highlight_main_highlighter_check_path()
|
|||||||
fi
|
fi
|
||||||
return 0
|
return 0
|
||||||
elif [[ ! -d $expanded_path ]]; then
|
elif [[ ! -d $expanded_path ]]; then
|
||||||
REPLY=command
|
# ### This seems unreachable for the current callers
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@ -1744,6 +1752,8 @@ _zsh_highlight_main__precmd_hook() {
|
|||||||
_zsh_highlight_main__path_cache=()
|
_zsh_highlight_main__path_cache=()
|
||||||
_zsh_highlight_main__arg_cache=()
|
_zsh_highlight_main__arg_cache=()
|
||||||
|
|
||||||
|
_zsh_highlight_main__rehash=1
|
||||||
|
|
||||||
if [[ $ZSH_VERSION != (5.<9->*|<6->.*) ]]; then
|
if [[ $ZSH_VERSION != (5.<9->*|<6->.*) ]]; then
|
||||||
_zsh_highlight_main_calculate_styles
|
_zsh_highlight_main_calculate_styles
|
||||||
fi
|
fi
|
||||||
@ -1753,10 +1763,12 @@ autoload -Uz add-zsh-hook
|
|||||||
if add-zsh-hook precmd _zsh_highlight_main__precmd_hook 2>/dev/null; then
|
if add-zsh-hook precmd _zsh_highlight_main__precmd_hook 2>/dev/null; then
|
||||||
# Initialize caches
|
# Initialize caches
|
||||||
typeset -gA _zsh_highlight_main__command_type_cache _zsh_highlight_main__path_cache _zsh_highlight_main__arg_cache
|
typeset -gA _zsh_highlight_main__command_type_cache _zsh_highlight_main__path_cache _zsh_highlight_main__arg_cache
|
||||||
|
typeset -gi _zsh_highlight_main__rehash=1
|
||||||
else
|
else
|
||||||
print -r -- >&2 'zsh-syntax-highlighting: Failed to load add-zsh-hook. Some speed optimizations will not be used.'
|
print -r -- >&2 'zsh-syntax-highlighting: Failed to load add-zsh-hook. Some speed optimizations will not be used.'
|
||||||
# Make sure the caches are unset
|
# Make sure the caches are unset
|
||||||
unset _zsh_highlight_main__command_type_cache _zsh_highlight_main__path_cache _zsh_highlight_main__arg_cache
|
unset _zsh_highlight_main__command_type_cache _zsh_highlight_main__path_cache _zsh_highlight_main__arg_cache
|
||||||
|
unset _zsh_highlight_main__rehash
|
||||||
fi
|
fi
|
||||||
typeset -ga ZSH_HIGHLIGHT_DIRS_BLACKLIST
|
typeset -ga ZSH_HIGHLIGHT_DIRS_BLACKLIST
|
||||||
|
|
||||||
|
44
highlighters/main/test-data/new-command.zsh
Normal file
44
highlighters/main/test-data/new-command.zsh
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
# 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
|
||||||
|
# -------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
if [[ $OSTYPE == msys ]]; then
|
||||||
|
skip_test='Cannot chmod +x in msys2'
|
||||||
|
else
|
||||||
|
path+=($PWD/foo)
|
||||||
|
: $+commands[zsyh-new-command]
|
||||||
|
mkdir foo
|
||||||
|
print >foo/zsyh-new-command
|
||||||
|
chmod +x foo/zsyh-new-command
|
||||||
|
|
||||||
|
BUFFER='zsyh-new-command'
|
||||||
|
|
||||||
|
expected_region_highlight=(
|
||||||
|
"1 16 command"
|
||||||
|
)
|
||||||
|
fi
|
Loading…
Reference in New Issue
Block a user