emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/eglot 37296ed 14/16: Format documentation in completion


From: João Távora
Subject: [elpa] externals/eglot 37296ed 14/16: Format documentation in completion annotations
Date: Mon, 9 Jul 2018 17:27:14 -0400 (EDT)

branch: externals/eglot
commit 37296ed6daef09e7482da7b4cec94bb4f3529d3a
Author: Ricardo Martins <address@hidden>
Commit: João Távora <address@hidden>

    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
---
 eglot.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/eglot.el b/eglot.el
index fd63338..396590f 100644
--- a/eglot.el
+++ b/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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]