From 9e792ba6c596a97e8adf1e5c93679e5c551e30e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Tue, 11 Feb 2025 13:59:46 +0000 Subject: [PATCH] Eglot: make better use of :company-docsig * lisp/progmodes/eglot.el (eglot-completion-at-point): Make better use of :company-docsig (cherry picked from commit 4847168c5b4b015eec0e9feca0ccc3cfdf17e837) --- lisp/progmodes/eglot.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index e3af1862ac8..db9c94289a2 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -3522,12 +3522,13 @@ for which LSP on-type-formatting should be requested." 1) (eq t (plist-get lsp-item :deprecated))))) :company-docsig - ;; FIXME: autoImportText is specific to the pyright language server (lambda (proxy) - (when-let* ((lsp-comp (get-text-property 0 'eglot--lsp-item proxy)) - (data (plist-get (ensure-resolved lsp-comp) :data)) - (import-text (plist-get data :autoImportText))) - import-text)) + (let ((detail (plist-get + (ensure-resolved (get-text-property 0 'eglot--lsp-item proxy)) + :detail))) + (when (and (stringp detail) (not (string= detail ""))) + ;; Forces major-mode based fontification + (eglot--format-markup (list :value detail))))) :company-doc-buffer (lambda (proxy) (let* ((resolved -- 2.39.5