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: Don't highlight paths existing in CDPATH, unless it's cd

Browse source
This commit is contained in:
Sebastian Gniazdowski 2016-10-31 11:37:42 +01:00
parent 68348d09ee
commit 8e8969095b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hsmw-highlight
View file

@ -222,7 +222,7 @@ __HSMW_HIGHLIGHT_TOKENS_TYPES=(
# in_array_assignment true between 'a=(' and the matching ')' # in_array_assignment true between 'a=(' and the matching ')'
# braces_stack: "R" for round, "Q" for square, "Y" for curly # braces_stack: "R" for round, "Q" for square, "Y" for curly
# mybuf, cdpath_dir are used in sub-functions # mybuf, cdpath_dir are used in sub-functions
local start_pos=0 end_pos highlight_glob=1 arg style in_array_assignment=0 MATCH expanded_path braces_stack buf="$1" mybuf cdpath_dir local start_pos=0 end_pos highlight_glob=1 arg style in_array_assignment=0 MATCH expanded_path braces_stack buf="$1" mybuf cdpath_dir cur_cmd
# arg_type can be 0, 1, 2 or 3, i.e. precommand, control flow, command separator # arg_type can be 0, 1, 2 or 3, i.e. precommand, control flow, command separator
# idx and end_idx are used in sub-functions # idx and end_idx are used in sub-functions
# for this_word and next_word look below at commented integers and at state machine description # for this_word and next_word look below at commented integers and at state machine description
@ -381,6 +381,7 @@ __HSMW_HIGHLIGHT_TOKENS_TYPES=(
style=reserved-word # de facto a reserved word, although not de jure style=reserved-word # de facto a reserved word, although not de jure
(( next_word = 1 )) (( next_word = 1 ))
elif (( this_word & 1 )) && (( in_redirection == 0 )); then # $arg is the command word elif (( this_word & 1 )) && (( in_redirection == 0 )); then # $arg is the command word
cur_cmd="$arg"
if (( arg_type == 1 )); then if (( arg_type == 1 )); then
style=precommand style=precommand
elif [[ "$arg" = "sudo" ]]; then elif [[ "$arg" = "sudo" ]]; then
@ -613,8 +614,8 @@ __HSMW_HIGHLIGHT_TOKENS_TYPES=(
[[ -z $expanded_path ]] && return 1 [[ -z $expanded_path ]] && return 1
[[ -e $expanded_path ]] && return 0 [[ -e $expanded_path ]] && return 0
# Search the path in CDPATH # Search the path in CDPATH, only for CD command
for cdpath_dir in $cdpath ; do [[ "$cur_cmd" = "cd" ]] && for cdpath_dir in $cdpath ; do
[[ -e "$cdpath_dir/$expanded_path" ]] && return 0 [[ -e "$cdpath_dir/$expanded_path" ]] && return 0
done done