emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/embark 5bdf21c0b5 2/2: Use the new consult-imenu--group


From: ELPA Syncer
Subject: [elpa] externals/embark 5bdf21c0b5 2/2: Use the new consult-imenu--group function
Date: Mon, 2 May 2022 16:57:33 -0400 (EDT)

branch: externals/embark
commit 5bdf21c0b5841af86f9508929e8463474dd822fd
Author: Omar Antolín <omar.antolin@gmail.com>
Commit: Omar Antolín <omar.antolin@gmail.com>

    Use the new consult-imenu--group function
---
 embark-consult.el | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/embark-consult.el b/embark-consult.el
index 72cb479f1a..24add01c16 100644
--- a/embark-consult.el
+++ b/embark-consult.el
@@ -369,31 +369,20 @@ for any action that is a Consult async command."
   (cons 'consult-location (consult--outline-candidates)))
 
 (autoload 'consult-imenu--items "consult-imenu")
+
 (defun embark-consult-imenu-candidates ()
   "Collect all imenu items in the current buffer."
   (cons 'imenu (mapcar #'car (consult-imenu--items))))
 
-(defvar consult-imenu-config)
+(declare-function consult-imenu--group "ext:consult-imenu")
+
 (defun embark-consult--imenu-group-function (type prop)
   "Return a suitable group-function for imenu.
 TYPE is the completion category.
 PROP is the metadata property.
 Meant as :after-until advice for `embark-collect--metadatum'."
-  (when-let (((and (eq type 'imenu) (eq prop 'group-function)))
-             (config (plist-get
-                      (cdr (seq-find (lambda (x) (derived-mode-p (car x)))
-                                     consult-imenu-config))
-                      :types)))
-    ;; taken from consult-imenu
-    ;; TODO extract the function from consult-imenu, reuse it here.
-    (lambda (cand transform)
-      (let ((type (get-text-property 0 'consult--type cand)))
-        (cond
-         ((and transform type)
-          (substring
-           cand (1+ (next-single-property-change 0 'consult--type cand))))
-         (transform cand)
-         (type (car (alist-get type config))))))))
+  (when (and (eq type 'imenu) (eq prop 'group-function))
+    (consult-imenu--group)))
 
 (advice-add #'embark-collect--metadatum :after-until
             #'embark-consult--imenu-group-function)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]