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

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

[elpa] externals/consult 2d59f238bb: Use xref--group-name-for-display if


From: ELPA Syncer
Subject: [elpa] externals/consult 2d59f238bb: Use xref--group-name-for-display if available (Fix #494)
Date: Mon, 10 Jan 2022 13:57:25 -0500 (EST)

branch: externals/consult
commit 2d59f238bbed8e02155f095fe0555b43c14fd54f
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Use xref--group-name-for-display if available (Fix #494)
---
 consult-xref.el | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/consult-xref.el b/consult-xref.el
index 2f3d1adb0b..f99eb41c2b 100644
--- a/consult-xref.el
+++ b/consult-xref.el
@@ -32,16 +32,22 @@
 
 (defun consult-xref--candidates (xrefs)
   "Return candidate list from XREFS."
-  (mapcar (lambda (xref)
-            (let* ((loc (xref-item-location xref))
-                   (group (xref-location-group loc))
-                   (cand (consult--format-location group
-                                                   (or (xref-location-line 
loc) 0)
-                                                   (xref-item-summary xref))))
-              (add-text-properties
-               0 1 `(consult--candidate ,xref consult-xref--group ,group) cand)
-              cand))
-          xrefs))
+  (let ((root (consult--project-root)))
+    (mapcar (lambda (xref)
+              (let* ((loc (xref-item-location xref))
+                     (group (if (fboundp 'xref--group-name-for-display)
+                                ;; This function is available in xref 1.3.2
+                                (xref--group-name-for-display
+                                 (xref-location-group loc) root)
+                              (xref-location-group loc)))
+                     (cand (consult--format-location
+                            group
+                            (or (xref-location-line loc) 0)
+                            (xref-item-summary xref))))
+                (add-text-properties
+                 0 1 `(consult--candidate ,xref consult-xref--group ,group) 
cand)
+                cand))
+            xrefs)))
 
 (defun consult-xref--preview (display)
   "Xref preview with DISPLAY function."



reply via email to

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