Use the container name of a symbol in imenu

* eglot.el (eglot-imenu): Prepend :containerName to each symbol, when
  provided.

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 26ee814755ad2648fb8f71c6a976169877268c1e..e15170400d8caf79e002a233e44b5613659f1aaf 100644 (file)
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1657,10 +1657,15 @@ If SKIP-SIGNATURE, don't try to send textDocument/signatureHelp."
       (let ((entries
              (mapcar
               (jsonrpc-lambda
-                  (&key name kind location _containerName _deprecated)
+                  (&key name kind location containerName _deprecated)
                 (cons (propertize
-                       name :kind (alist-get kind eglot--symbol-kind-names
-                                             "(Unknown)"))
+                       (concat
+                        (and (stringp containerName)
+                             (not (string-empty-p containerName))
+                             (concat containerName "::"))
+                        name)
+                       :kind (alist-get kind eglot--symbol-kind-names
+                                        "(Unknown)"))
                       (eglot--lsp-position-to-point
                        (plist-get (plist-get location :range) :start))))
               (jsonrpc-request (eglot--current-server-or-lose)