From 9b3ef1315ce3d0cb3762a92158a7241af31dd6cc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Mon, 25 Jun 2018 13:12:55 +0100
Subject: [PATCH] Unbreak imenu for cquery servers (and probably more)

* eglot.el (eglot-imenu): Don't try to make a group for symbols
without kind.

GitHub-reference: close https://github.com/joaotavora/eglot/issues/31
---
 lisp/progmodes/eglot.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index f8574e9428e..88746a72823 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1349,8 +1349,10 @@ If SKIP-SIGNATURE, don't try to send textDocument/signatureHelp."
                                :textDocument/documentSymbol
                                `(:textDocument ,(eglot--TextDocumentIdentifier))))))
         (append
-         (seq-group-by (lambda (e) (get-text-property 0 :kind (car e)))
-                       entries)
+         (cl-remove nil
+                    (seq-group-by (lambda (e) (get-text-property 0 :kind (car e)))
+                                  entries)
+                    :key #'car)
          entries))
     (funcall oldfun)))
 
-- 
2.39.2