Fix a bug with menu widgets & partial lists

marlonrichert · Jul 17, 2021 · 24e2350 · 24e2350
1 parent 5cd54a0
commit 24e2350
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/completion/_autocomplete.unambiguous b/completion/_autocomplete.unambiguous
@@ -22,7 +22,6 @@ fi
 
 local tag=unambiguous
 _tags $tag
-_tags && _requested $tag &&
-  _message -e unambiguous \
-      $'%{\e[1;2;39m%}common substring:%b %F{0}%K{11}'"$compstate[unambiguous]%f%k"
-      # \e[2m = faint; 0 = black; 11 = bright yellow
+_tags && _requested $tag && _message -e unambiguous \
+    $'%{\e[1;2;39m%}common substring:%b %F{0}%K{11}'"$compstate[unambiguous]%f%k"
+    # \e[2m = faint; 0 = black; 11 = bright yellow
diff --git a/module/.autocomplete.async b/module/.autocomplete.async
@@ -367,10 +367,8 @@ zle -N history-incremental-search-forward .autocomplete.async.history-incrementa
 }
 
 .autocomplete.async.list-choices.post() {
-  if [[ -v _autocomplete__partial_list ]]; then
+  [[ -v _autocomplete__partial_list ]] &&
     compadd -J -last- -x '%F{black}%K{14}(MORE)%f%k'
-    unset _autocomplete__partial_list
-  fi
   compstate[insert]=
   unset MENUSELECT MENUMODE
 }

diff --git a/module/.autocomplete.compinit b/module/.autocomplete.compinit
@@ -92,6 +92,7 @@ EOF
   .autocomplete.patch _main_complete
   _main_complete() {
     local -i ret=1 _autocomplete__reserved_lines=0
+    unset _autocomplete__partial_list
 
     compstate[insert]=menu  # To get the best output from `_expand` (and some other functions).
     compstate[last_prompt]=yes  # Completion doesn't stay on the same command line without this.

diff --git a/widget/.autocomplete.complete-word.completion-widget b/widget/.autocomplete.complete-word.completion-widget
@@ -3,7 +3,7 @@ builtin autoload -Uz .autocomplete.complete-word.post
 
 local +h curcontext=${curcontext:-${WIDGET}:::}
 local +h -a comppostfuncs=( .autocomplete.complete-word.post "$comppostfuncs[@]" )
-if  [[ $WIDGET == *menu-* ]] ||
+if [[ $WIDGET == *menu-* && -v _autocomplete__partial_list ]] ||
     ( ( [[ "$KEYS" == "$key[Shift-Tab]" ]] ||
         zstyle -t ":autocomplete:${(kL)key[(Re)$KEYS]}:" insert-unambiguous
       ) && [[