From: João Távora <joaotavora@gmail.com>
Date: Sun, 2 Dec 2018 10:54:09 +0000 (+0000)
Subject: Support completioncontext to help servers like ccls
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~379
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=949cf4e7a9725d414760dd02d463c3e67786b102;p=emacs.git

Support completioncontext to help servers like ccls

* eglot.el (eglot-client-capabilities): Annouce
textDocument/completion/contextSupport.
(eglot--CompletionParams): New helper.
(eglot-completion-at-point): Use it.

GitHub-reference: close https://github.com/joaotavora/eglot/issues/173
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index b240e0e860b..ac10b434c7e 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -374,7 +374,8 @@ treated as in `eglot-dbind'."
                                     `(:snippetSupport
                                       ,(if (eglot--snippet-expansion-fn)
                                            t
-                                         :json-false)))
+                                         :json-false))
+                                    :contextSupport t)
              :hover              `(:dynamicRegistration :json-false)
              :signatureHelp      `(:dynamicRegistration :json-false)
              :references         `(:dynamicRegistration :json-false)
@@ -1374,6 +1375,19 @@ THINGS are either registrations or unregisterations."
   (list :textDocument (eglot--TextDocumentIdentifier)
         :position (eglot--pos-to-lsp-position)))
 
+(defun eglot--CompletionParams ()
+  (append
+   (eglot--TextDocumentPositionParams)
+   `(:context
+     ,(if-let (trigger (and (eq last-command 'self-insert-command)
+                            (characterp last-input-event)
+                            (cl-find last-input-event
+                                     (eglot--server-capable :completionProvider
+                                                            :triggerCharacters)
+                                     :key (lambda (str) (aref str 0))
+                                     :test #'char-equal)))
+          `(:triggerKind 2 :triggerCharacter ,trigger) `(:triggerKind 1)))))
+
 (defvar-local eglot--recent-changes nil
   "Recent buffer changes as collected by `eglot--before-change'.")
 
@@ -1693,7 +1707,7 @@ is not active."
         (lambda (_ignored)
           (let* ((resp (jsonrpc-request server
                                         :textDocument/completion
-                                        (eglot--TextDocumentPositionParams)
+                                        (eglot--CompletionParams)
                                         :deferred :textDocument/completion
                                         :cancel-on-input t))
                  (items (if (vectorp resp) resp (plist-get resp :items))))