[elpa] externals/ivy-hydra 71c59ae 377/395: ivy.el (ivy--format-minibuffer-line): Check for annotation-function in one more place

[Basil L. Contovounesios]

branch: externals/ivy-hydra
commit 71c59aecf669142ebe264fac8ff7b440c0c71712
Author: Oleh Krehel <ohwoeowho@gmail.com>
Commit: Oleh Krehel <ohwoeowho@gmail.com>

    ivy.el (ivy--format-minibuffer-line): Check for annotation-function in one 
more place
---
 ivy.el | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ivy.el b/ivy.el
index 00f56a3..feecf74 100644
--- a/ivy.el
+++ b/ivy.el
@@ -3284,10 +3284,14 @@ The function was added in Emacs 26.1.")
           "~"
         home)))))
 
+(defvar ivy--minibuffer-metadata nil)
+
 (defun ivy-update-candidates (cands)
-  (ivy--insert-minibuffer
-   (ivy--format
-    (setq ivy--all-candidates cands))))
+  (let ((ivy--minibuffer-metadata
+         (completion-metadata "" minibuffer-completion-table 
minibuffer-completion-predicate)))
+    (ivy--insert-minibuffer
+     (ivy--format
+      (setq ivy--all-candidates cands)))))
 
 (defun ivy--exhibit ()
   "Insert Ivy completions display.
@@ -4030,7 +4034,8 @@ in this case."
                     (funcall ivy--highlight-function str))
                 str))
          (olen (length str))
-         (annot (plist-get completion-extra-properties :annotation-function)))
+         (annot (or (completion-metadata-get ivy--minibuffer-metadata 
'annotation-function)
+                    (plist-get completion-extra-properties 
:annotation-function))))
     (add-text-properties
      0 olen
      '(mouse-face