Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 09:14:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

* lisp/imenu.el (imenu-flatten): Add new choice 'group' (bug#70846).

Browse source 
(imenu-flatten): For prefix use the implicit symbol 'prefix'.
(imenu--completion-buffer): Use :group-function
if imenu-flatten is 'group'.
(imenu--flatten-index-alist): Handle the value 'group' of
imenu-flatten in a way similar to the value 'annotation'.
This commit is contained in:
Juri Linkov 2024-05-29 21:05:20 +03:00
parent 17c23a46c3
commit f469ab73a7
1 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lisp/imenu.el
View file

@ -151,15 +151,18 @@ Used for flattening nested indexes with name concatenation."
(defcustom imenu-flatten nil
"Whether to flatten the list of sections in an imenu or show it nested.
If nil, use nested indexes.
If t, pop up the completion buffer with a flattened menu.
If `prefix', pop up the completion buffer with a flattened menu
where section names are used as a prefix.
If `annotation', use completion annotation as a suffix
to append section names after the index names.
If `group', split completions into groups.
The string from `imenu-level-separator' is used to separate names of
nested levels while flattening nested indexes with name concatenation."
:type '(choice (const :tag "Nested" nil)
(const :tag "By prefix" t)
(const :tag "By suffix" annotation))
(const :tag "By prefix" prefix)
(const :tag "By annotation" annotation)
(const :tag "By group" group))
:version "30.1")
(defcustom imenu-generic-skip-comments-and-strings t
@ -758,7 +761,13 @@ Return one of the entries in index-alist or nil."
,@(when (eq imenu-flatten 'annotation)
`(:annotation-function
,(lambda (s) (get-text-property
0 'imenu-section s))))))
0 'imenu-section s))))
,@(when (eq imenu-flatten 'group)
`(:group-function
,(lambda (s transform)
(if transform s
(get-text-property
0 'imenu-section s)))))))
(unless imenu-eager-completion-buffer
(minibuffer-completion-help)))
(setq name (completing-read prompt
@ -801,15 +810,20 @@ Returns t for rescan and otherwise an element or subelement of INDEX-ALIST."
(new-prefix (and concat-names
(if prefix
(concat prefix imenu-level-separator name)
(if (eq imenu-flatten 'annotation)
(propertize name 'imenu-choice item)
name)))))
name))))
(cond
((not (imenu--subalist-p item))
(list (cons (if (and (eq imenu-flatten 'annotation) prefix)
(propertize name 'imenu-section
(format " (%s)" prefix))
new-prefix)
(list (cons (pcase imenu-flatten
('annotation
(if prefix
(propertize name
'imenu-section (format " (%s)" prefix)
'imenu-choice item)
(propertize new-prefix 'imenu-choice item)))
('group (propertize name
'imenu-section (or prefix "*")
'imenu-choice item))
(_ new-prefix))
pos)))
(t
(imenu--flatten-index-alist pos concat-names new-prefix)))))