treat more widgets as accept-* kind of widgets and make it configurable

Author: m0vie

highlighters/cursor/cursor-highlighter.zsh

@@ -34,15 +34,14 @@
 # Whether the cursor highlighter should be called or not.
 _zsh_highlight_cursor_highlighter_predicate()
 {
-  # accept-* may trigger removal of cursor highlighting
-  [[ $WIDGET == accept-* ]] ||
-    _zsh_highlight_cursor_moved
+  # widgets which accept lines may trigger removal of cursor highlighting
+  _zsh_highlight_cursor_moved || _zsh_highlight_is_accept_line_type_widget
 }
 
 # Cursor highlighting function.
 _zsh_highlight_cursor_highlighter()
 {
-  [[ $WIDGET == accept-* ]] && return
-  
+  _zsh_highlight_is_accept_line_type_widget && return
+
   region_highlight+=("$CURSOR $(( $CURSOR + 1 )) $ZSH_HIGHLIGHT_STYLES[cursor]")
 }

highlighters/main/main-highlighter.zsh

@@ -60,8 +60,8 @@
 # Whether the highlighter should be called or not.
 _zsh_highlight_main_highlighter_predicate()
 {
-  # accept-* may trigger removal of path_prefix highlighting
-  [[ $WIDGET == accept-* ]] ||
+  # widgets which accept lines may trigger removal of path_prefix highlighting
+  _zsh_highlight_is_accept_line_type_widget ||
     _zsh_highlight_buffer_modified
 }
 
@@ -455,7 +455,7 @@ _zsh_highlight_main_highlighter_check_path()
 
   # If this word ends the buffer, check if it's the prefix of a valid path.
   if [[ ${BUFFER[1]} != "-" && ${#BUFFER} == $end_pos ]] &&
-     [[ $WIDGET != accept-* ]]; then
+     ! _zsh_highlight_is_accept_line_type_widget; then
     local -a tmp
     tmp=( ${expanded_path}*(N) )
     (( $#tmp > 0 )) && style_override=path_prefix && return 0

zsh-syntax-highlighting.zsh

@@ -53,6 +53,9 @@ fi
 # Array declaring active highlighters names.
 typeset -ga ZSH_HIGHLIGHT_HIGHLIGHTERS
 
+# Array declaring accept-style widget names.
+typeset -ga ZSH_HIGHLIGHT_ACCEPTING_WIDGETS
+
 # Update ZLE buffer syntax highlighting.
 #
 # Invokes each highlighter that needs updating.
@@ -174,6 +177,14 @@ _zsh_highlight_cursor_moved()
   [[ -n $CURSOR ]] && [[ -n ${_ZSH_HIGHLIGHT_PRIOR_CURSOR-} ]] && (($_ZSH_HIGHLIGHT_PRIOR_CURSOR != $CURSOR))
 }
 
+# Whether the current widget is an accept-line type widget.
+#
+# Returns 0 if the the current widget is an accept-line type widget.
+_zsh_highlight_is_accept_line_type_widget()
+{
+  [[ $WIDGET == ${~"${:-(${(j:|:)ZSH_HIGHLIGHT_ACCEPTING_WIDGETS})}"} ]]
+}
+
 
 # -------------------------------------------------------------------------------------------------
 # Setup functions
@@ -284,3 +295,6 @@ add-zsh-hook preexec _zsh_highlight_preexec_hook 2>/dev/null || {
 
 # Initialize the array of active highlighters if needed.
 [[ $#ZSH_HIGHLIGHT_HIGHLIGHTERS -eq 0 ]] && ZSH_HIGHLIGHT_HIGHLIGHTERS=(main) || true
+
+# Initialize the array of accept-style widgets if needed.
+[[ $#ZSH_HIGHLIGHT_ACCEPTING_WIDGETS -eq 0 ]] && ZSH_HIGHLIGHT_ACCEPTING_WIDGETS=('accept-*' zle-isearch-exit) || true