branch: externals/eglot commit 29172141500e5608c0744fb99edca2ff0c6f9cdc Merge: 44e9647 1f7bcb1 Author: João Távora <joaotav...@gmail.com> Commit: João Távora <joaotav...@gmail.com>
Merge master into jsonrpc-refactor --- eglot.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eglot.el b/eglot.el index cdb1c5b..70d133b 100644 --- a/eglot.el +++ b/eglot.el @@ -596,6 +596,9 @@ If optional MARKERS, make markers." (cl-find major-mode (gethash probe eglot--servers-by-project) :key #'eglot--major-mode))) +(defvar-local eglot--unreported-diagnostics nil + "Unreported Flymake diagnostics for this buffer.") + (defun eglot--maybe-activate-editing-mode (&optional server) "Maybe activate mode function `eglot--managed-mode'. If SERVER is supplied, do it only if BUFFER is managed by it. In @@ -604,6 +607,7 @@ that case, also signal textDocument/didOpen." (let* ((cur (and buffer-file-name (eglot--find-current-server))) (server (or (and (null server) cur) (and server (eq server cur) cur)))) (when server + (setq eglot--unreported-diagnostics `(:just-opened . nil)) (eglot--managed-mode-onoff server 1) (eglot--signal-textDocument/didOpen)))) @@ -730,9 +734,6 @@ Uses THING, FACE, DEFS and PREPEND." (_server (_method (eql telemetry/event)) &rest _any) "Handle notification telemetry/event") ;; noop, use events buffer -(defvar-local eglot--unreported-diagnostics nil - "Unreported diagnostics for this buffer.") - (cl-defmethod eglot-handle-notification (server (_method (eql textDocument/publishDiagnostics)) &key uri diagnostics) "Handle notification publishDiagnostics"