Format documentation in completion annotations

Fixes an issue with the latest RLS, where the server returns a plist
instead of a plain string as documentation for completion candidates,
which broke the `annotation-function`. This change was introduced by
https://github.com/rust-lang-nursery/rls/commit/206a9fb41e837333d0e67187a6a9fe24868b77a4

Copyright-paperwork-exempt: yes

* eglot.el (eglot-completion-at-point): Use eglot--format-markup

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index fd633388452ebed1e46c9744e3eb325000c81d66..396590f6fd0199b574beaa16f7d7599cc831108a 100644 (file)
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1216,10 +1216,10 @@ DUMMY is ignored."
                  (items (if (vectorp resp) resp (plist-get resp :items))))
             (mapcar
              (jsonrpc-lambda (&rest all &key label insertText &allow-other-keys)
-               (let ((insert (or insertText label)))
-                 (add-text-properties 0 1 all insert)
-                 (put-text-property 0 1 'eglot--lsp-completion all insert)
-                 insert))
+                             (let ((insert (or insertText label)))
+                               (add-text-properties 0 1 all insert)
+                               (put-text-property 0 1 'eglot--lsp-completion all insert)
+                               insert))
              items))))
        :annotation-function
        (lambda (obj)
@@ -1227,7 +1227,8 @@ DUMMY is ignored."
              (text-properties-at 0 obj)
            (let ((annotation
                   (or (and documentation
-                           (replace-regexp-in-string "\n.*" "" documentation))
+                           (replace-regexp-in-string
+                            "\n.*" "" (eglot--format-markup documentation)))
                       detail
                       (cdr (assoc kind eglot--kind-names)))))
              (when annotation