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

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

[elpa] externals/eglot 98943f1 05/10: Add a completion-category-defaults


From: Stefan Monnier
Subject: [elpa] externals/eglot 98943f1 05/10: Add a completion-category-defaults entry
Date: Wed, 19 May 2021 21:52:13 -0400 (EDT)

branch: externals/eglot
commit 98943f1bef771849f292209868bc9540430d4e0d
Author: Augusto Stoffel <arstoffel@gmail.com>
Commit: João Távora <joaotavora@gmail.com>

    Add a completion-category-defaults entry
    
    Setting completion-styles buffer-locally is harder to customize and
    can break some completion UIs.
    
    Emacs bug#48073
    
    * eglot.el: Add a completion-category-defaults entry, if applicable.
    (eglot--managed-mode): Don't set `completion-styles'
    (eglot-completion-at-point): Add style metadata to
    completion table.
---
 eglot.el | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/eglot.el b/eglot.el
index 3348054..122a76b 100644
--- a/eglot.el
+++ b/eglot.el
@@ -222,6 +222,10 @@ let the buffer grow forever."
   :type '(choice (const :tag "Don't show confirmation prompt" nil)
                  (symbol :tag "Show confirmation prompt" 'confirm)))
 
+;; Customizable via `completion-category-overrides'.
+(when (assoc 'flex completion-styles-alist)
+  (add-to-list 'completion-category-defaults '(eglot (styles flex basic))))
+
 
 ;;; Constants
 ;;;
@@ -1421,8 +1425,6 @@ Use `eglot-managed-p' to determine if current buffer is 
managed.")
     (eglot--setq-saving flymake-diagnostic-functions '(eglot-flymake-backend))
     (eglot--setq-saving company-backends '(company-capf))
     (eglot--setq-saving company-tooltip-align-annotations t)
-    (when (assoc 'flex completion-styles-alist)
-      (eglot--setq-saving completion-styles '(flex basic)))
     (unless (eglot--stay-out-of-p 'imenu)
       (add-function :before-until (local 'imenu-create-index-function)
                     #'eglot-imenu))
@@ -2166,7 +2168,8 @@ is not active."
                                    (get-text-property 0 'eglot--lsp-item c)
                                    :sortText)
                                   "")))))
-           (metadata `(metadata . ((display-sort-function . 
,sort-completions))))
+           (metadata `(metadata (category . eglot)
+                                (display-sort-function . ,sort-completions)))
            resp items (cached-proxies :none)
            (proxies
             (lambda ()



reply via email to

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