[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
- [elpa] externals/eglot updated (f385d9c -> 07b235f), João Távora, 2018/07/09
- [elpa] externals/eglot e8f0d89 02/16: * jsonrpc.el (jsonrpc-process-type): Actually return process-type., João Távora, 2018/07/09
- [elpa] externals/eglot 6239ca6 05/16: Close #30: Fix typo in the solargraph server program, João Távora, 2018/07/09
- [elpa] externals/eglot c94b028 04/16: Fix some rather silly bugs in some interactive specs, João Távora, 2018/07/09
- [elpa] externals/eglot a6fee46 09/16: Fix typo (#35), João Távora, 2018/07/09
- [elpa] externals/eglot 7467c15 11/16: Close #36: Inhibit auto-reconnect until connection is established, João Távora, 2018/07/09
- [elpa] externals/eglot a261a7b 10/16: Close #33: Bind default-directory when launching servers, João Távora, 2018/07/09
- [elpa] externals/eglot 543483a 13/16: Close #37: Unbreak completion when no possible annotation, João Távora, 2018/07/09
- [elpa] externals/eglot 1a61522 08/16: Close #32: Cache buffer's managing server, João Távora, 2018/07/09
- [elpa] externals/eglot 37296ed 14/16: Format documentation in completion annotations,
João Távora <=
- [elpa] externals/eglot 45c651e 06/16: Per #31: Unbreak basic imenu functionality, João Távora, 2018/07/09
- [elpa] externals/eglot a99e129 03/16: Adjust timeout strategy when running tests, João Távora, 2018/07/09
- [elpa] externals/eglot 017fbdc 07/16: Close #31: Unbreak Imenu for cquery servers (and probably more), João Távora, 2018/07/09
- [elpa] externals/eglot 8219088 12/16: Close #34: Handle outrageously large and buggy line numbers, João Távora, 2018/07/09
- [elpa] externals/eglot 55ee8e9 15/16: * eglot.el (eglot-completion-at-point): Fix broken indentation, João Távora, 2018/07/09
- [elpa] externals/eglot 4354710 01/16: Implement TCP autostart/autoconnect (and support Ruby's Solargraph), João Távora, 2018/07/09
- [elpa] externals/eglot 07b235f 16/16: jsonrpc.el is now a GNU ELPA depedency, João Távora, 2018/07/09