procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eglot: fix problems after changes to eglot-imenu (bug#62718)

Browse source 
* lisp/progmodes/eglot.el (eglot--imenu-SymbolInformation)
(eglot--imenu-DocumentSymbol): Fix.
This commit is contained in:
João Távora 2023-04-07 23:00:44 +01:00
parent cc288a0e33
commit 9848ae1716
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/progmodes/eglot.el
View file

@ -3247,7 +3247,8 @@ for which LSP on-type-formatting should be requested."
(let ((elems (mapcar
(eglot--lambda ((SymbolInformation) kind name location)
(let ((reg (eglot--range-region
(plist-get location :range))))
(plist-get location :range)))
(kind (alist-get kind eglot--symbol-kind-names)))
(cons (propertize name
'breadcrumb-region reg
'breadcrumb-kind kind)
@ -3262,13 +3263,14 @@ for which LSP on-type-formatting should be requested."
"Compute `imenu--index-alist' for RES vector of DocumentSymbol."
(cl-labels ((dfs (&key name children range kind &allow-other-keys)
(let* ((reg (eglot--range-region range))
(kind (alist-get kind eglot--symbol-kind-names))
(name (propertize name
'breadcrumb-region reg
'breadcrumb-kind kind)))
(if children
(cons name
(mapcar (lambda (c) (apply #'dfs c)) children))
(cons name (car reg))))))
(if (seq-empty-p children)
(cons name (car reg))
(cons name
(mapcar (lambda (c) (apply #'dfs c)) children))))))
(mapcar (lambda (s) (apply #'dfs s)) res)))
(defun eglot-imenu ()