cape-wrap-super: Call metadata functions with correct candidates

Make sure to call metadata functions only with candidates belonging to the
originating Capf.

1 files changed, 8 insertions, 7 deletions

diff --git a/cape.el b/cape.el
index d2bcc32..5f8d61c 100644
--- a/cape.el
+++ b/cape.el
@@ -1008,13 +1008,14 @@ multiple super Capfs in the `completion-at-point-functions':
         ,@(and (not exclusive) '(:exclusive no))
         ,@(mapcan
            (lambda (prop)
-             (list prop (lambda (cand &rest args)
-                          (let ((ref (get-text-property 0 'cape-capf-super cand)))
-                            (when-let ((fun (plist-get
-                                             (or (cdr ref)
-                                                 (and cand-ht (gethash cand cand-ht)))
-                                             prop)))
-                              (apply fun (or (car ref) cand) args))))))
+             (list prop
+                   (lambda (cand &rest args)
+                     (if-let ((ref (get-text-property 0 'cape-capf-super cand)))
+                         (when-let ((fun (plist-get (cdr ref) prop)))
+                           (apply fun (car ref) args))
+                       (when-let ((plist (and cand-ht (gethash cand cand-ht)))
+                                  (fun (plist-get plist prop)))
+                         (apply fun cand args))))))
            cand-functions)))))
 
 ;;;###autoload