From: João Távora <joaotavora@gmail.com>
Date: Thu, 3 May 2018 14:10:32 +0000 (+0100)
Subject: Fix another flymake sync bug
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~662
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=878922319e7223888033a1dec9b3cc032573346c;p=emacs.git

Fix another flymake sync bug

* eglot.el (eglot-flymake-backend): Only report unreported sometimes.
(eglot--maybe-activate-editing-mode): Start flymake explicitly
when didOpen.
(eglot--textDocument/publishDiagnostics): No need to set
unreported-diagnostics to nil.
(flymake): Require it.
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index ccf4b723d3d..3561da2db46 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -32,6 +32,7 @@
 (require 'pcase)
 (require 'compile) ; for some faces
 (require 'warnings)
+(require 'flymake)
 
 (defgroup eglot nil
   "Interaction with Language Server Protocol servers"
@@ -657,12 +658,11 @@ running.  INTERACTIVE is t if called interactively."
                                   message))))
                    into diags
                    finally
-                   (if (null eglot--current-flymake-report-fn)
-                       (setq eglot--unreported-diagnostics
-                             diags)
-                     (funcall eglot--current-flymake-report-fn
-                              diags)
-                     (setq eglot--unreported-diagnostics nil))))))
+                   (if eglot--current-flymake-report-fn
+                       (funcall eglot--current-flymake-report-fn
+                                diags)
+                     (setq eglot--unreported-diagnostics
+                           diags))))))
      (t
       (eglot--message "OK so %s isn't visited" filename)))))
 
@@ -724,7 +724,8 @@ that case, also signal textDocument/didOpen."
                 (and proc (eq proc cur)))
         (unless eglot-editing-mode
           (eglot-editing-mode 1))
-        (eglot--signalDidOpen)))))
+        (eglot--signalDidOpen)
+        (flymake-start)))))
 
 (add-hook 'find-file-hook 'eglot--maybe-activate-editing-mode)
 
@@ -947,10 +948,11 @@ Records START, END and LENGTH locally."
 (defun eglot-flymake-backend (report-fn &rest _more)
   "An EGLOT Flymake backend.
 Calls REPORT-FN maybe if server publishes diagnostics in time."
-  ;; Call immediately with anything unreported (this will clear any
-  ;; pending diags)
-  (funcall report-fn eglot--unreported-diagnostics)
-  (setq eglot--unreported-diagnostics nil)
+  ;; Maybe call immediately if anything unreported (this will clear
+  ;; any pending diags)
+  (when eglot--unreported-diagnostics
+    (funcall report-fn eglot--unreported-diagnostics)
+    (setq eglot--unreported-diagnostics nil))
   ;; Setup so maybe it's called later, too.
   (setq eglot--current-flymake-report-fn report-fn)
   ;; Take this opportunity to signal a didChange that might eventually