branch: externals/elpa
commit d99a4478a9ede56d8e0ccf03800d70a78d8142a6
Author: muffinmad <[email protected]>
Commit: João Távora <[email protected]>
Close #439: Hide eldoc-message on empty hover info
Co-authored-by: João Távora <[email protected]>
* eglot.el (eglot-eldoc-function): Pass nil to eglot--update-doc
on empty hover info.
(eglot--update-doc): Skip update eglot help buffer if string
is nil.
---
eglot.el | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/eglot.el b/eglot.el
index 13571d4..c485b4e 100644
--- a/eglot.el
+++ b/eglot.el
@@ -2259,10 +2259,12 @@ Buffer is displayed with `display-buffer', which obeys
(defun eglot--update-doc (string hint)
"Put updated documentation STRING where it belongs.
Honours `eglot-put-doc-in-help-buffer'. HINT is used to
-potentially rename EGLOT's help buffer."
- (if (or (eq t eglot-put-doc-in-help-buffer)
- (and eglot-put-doc-in-help-buffer
- (funcall eglot-put-doc-in-help-buffer string)))
+potentially rename EGLOT's help buffer. If STRING is nil, the
+echo area cleared of any previous documentation."
+ (if (and string
+ (or (eq t eglot-put-doc-in-help-buffer)
+ (and eglot-put-doc-in-help-buffer
+ (funcall eglot-put-doc-in-help-buffer string))))
(with-current-buffer (eglot--help-buffer)
(let ((inhibit-read-only t)
(name (format "*eglot-help for %s*" hint)))
@@ -2314,10 +2316,10 @@ potentially rename EGLOT's help buffer."
:success-fn (eglot--lambda ((Hover) contents range)
(unless sig-showing
(when-buffer-window
- (when-let (info (and (not (seq-empty-p contents))
- (eglot--hover-info contents
- range)))
- (eglot--update-doc info thing-at-point)))))
+ (eglot--update-doc (and (not (seq-empty-p contents))
+ (eglot--hover-info contents
+ range))
+ thing-at-point))))
:deferred :textDocument/hover))
(when (eglot--server-capable :documentHighlightProvider)
(jsonrpc-async-request
