Mirrors/history-search-multi-word
2
0
Fork 0
mirror of https://github.com/zdharma-continuum/history-search-multi-word synced 2024-11-22 03:13:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

*highlight: Optimization: remove *-expand-path calls

Browse source 
Results are too random to store, main execution time varies much,
but for sure there is no slowdown.
This commit is contained in:
Sebastian Gniazdowski 2016-10-16 16:28:05 +02:00
parent 3b543a4ecc
commit af73d936de
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
hsmw-highlight
View file

@ -162,7 +162,7 @@ typeset -gA HSMW_HIGHLIGHT_STYLES
integer multi_func_def=0
fi
emulate -L zsh
setopt localoptions extendedglob bareglobqual
setopt localoptions extendedglob bareglobqual nonomatch
## Variable declarations and initializations
local start_pos=0 end_pos highlight_glob=true arg style
@ -382,7 +382,8 @@ typeset -gA HSMW_HIGHLIGHT_STYLES
(( next_word = next_word | BIT_sudo_opt ))
(( next_word = next_word | BIT_start ))
else
-hsmw-highlight-expand-path $arg
unset REPLY
: ${REPLY:=${(Q)~arg}}
-hsmw-highlight-main-type $REPLY
() {
# Special-case: command word is '$foo', like that, without braces or anything.
@ -646,7 +647,8 @@ typeset -gA HSMW_HIGHLIGHT_STYLES
# Else, return non-zero (and the contents of $REPLY is undefined).
-hsmw-highlight-check-path()
{
-hsmw-highlight-expand-path $arg;
unset REPLY
: ${REPLY:=${(Q)~arg}}
local expanded_path="$REPLY"
REPLY=path
@ -737,19 +739,6 @@ typeset -gA HSMW_HIGHLIGHT_STYLES
done
}
# Called with a single positional argument.
# Perform filename expansion (tilde expansion) on the argument and set $REPLY to the expanded value.
# Does not perform filename generation (globbing).
-hsmw-highlight-expand-path()
{
(( $# == 1 )) || print -r -- >&2 "hsmw-highlight: BUG: -hsmw-highlight-expand-path: called without argument"
# The $~1 syntax normally performs filename generation, but not when it's on the right-hand side of ${x:=y}.
setopt localoptions nonomatch
unset REPLY
: ${REPLY:=${(Q)~1}}
}
# -------------------------------------------------------------------------------------------------
# Main highlighter initialization
# -------------------------------------------------------------------------------------------------