stonewareslord/zsh-syntax-highlighting
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

main: Refresh highlighting upon accept-* widgets (accept-line et al).

Browse Source 
Use this to remove [path_prefix] highlighting during accept-* widgets.
This causes ": file.tx<CR>" to remove the underline from "file.tx", like
": file.tx<SPACE>" already does.  (Assume 'file.txt' exists.)
This commit is contained in:
Daniel Shahaf 2015-10-26 08:26:35 +00:00
parent 7723edf4f5
commit 59fbdda64c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
highlighters/main/main-highlighter.zsh
View File

@ -59,7 +59,9 @@
# Whether the highlighter should be called or not. # Whether the highlighter should be called or not.
_zsh_highlight_main_highlighter_predicate() _zsh_highlight_main_highlighter_predicate()
{ {
_zsh_highlight_buffer_modified # accept-* may trigger removal of path_prefix highlighting
[[ $WIDGET == accept-* ]] ||
_zsh_highlight_buffer_modified
} }
# Helper to deal with tokens crossing line boundaries. # Helper to deal with tokens crossing line boundaries.
@ -280,7 +282,8 @@ _zsh_highlight_main_highlighter_check_path()
[[ ! -e ${expanded_path:h} ]] && return 1 [[ ! -e ${expanded_path:h} ]] && return 1
# If this word ends the buffer, check if it's the prefix of a valid path. # If this word ends the buffer, check if it's the prefix of a valid path.
if [[ ${BUFFER[1]} != "-" && ${#BUFFER} == $end_pos ]]; then if [[ ${BUFFER[1]} != "-" && ${#BUFFER} == $end_pos ]] &&
[[ $WIDGET != accept-* ]]; then
local -a tmp local -a tmp
tmp=( ${expanded_path}*(N) ) tmp=( ${expanded_path}*(N) )
(( $#tmp > 0 )) && style_override=path_prefix && return 0 (( $#tmp > 0 )) && style_override=path_prefix && return 0

2
highlighters/main/test-data/path_prefix2.zsh
View File

@ -35,5 +35,5 @@ BUFFER='ls /bin/s'
WIDGET=accept-line WIDGET=accept-line
expected_region_highlight=( expected_region_highlight=(
"4 9 $ZSH_HIGHLIGHT_STYLES[default] 'implemented by next commit'" # /bin/s "4 9 $ZSH_HIGHLIGHT_STYLES[default]" # /bin/s
) )