Merge pull request #1116 from lem-project/fix-lsp-mode-invidual-misma…

…tch-between-diagnostics-and-completion Fix invidual mismatch between diagnostics and completion window
lem-project · Sep 29, 2023 · 7c14832 · 7c14832
2 parents f244af9 + deaed78
commit 7c14832
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/extensions/lsp-mode/lsp-mode.lisp b/extensions/lsp-mode/lsp-mode.lisp
@@ -738,7 +738,7 @@
     (do-sequence (diagnostic (lsp:publish-diagnostics-params-diagnostics params))
       (highlight-diagnostic buffer diagnostic))
     (setf (buffer-diagnostic-idle-timer buffer)
-          (start-timer (make-idle-timer #'popup-diagnostic :name "lsp-diagnostic")
+          (start-timer (make-idle-timer 'popup-diagnostic :name "lsp-diagnostic")
                        200
                        t))))
 
@@ -747,7 +747,8 @@
     (when (point<= (overlay-start overlay)
                    (current-point)
                    (overlay-end overlay))
-      (display-message (diagnostic-message (overlay-diagnostic overlay)))
+      (unless (mode-active-p (current-buffer) 'lem/completion-mode:completion-mode)
+        (display-message (diagnostic-message (overlay-diagnostic overlay))))
       (return))))
 
 (defun text-document/publish-diagnostics (params)

diff --git a/src/ext/completion-mode.lisp b/src/ext/completion-mode.lisp
@@ -6,7 +6,8 @@
            :completion-item-label
            :completion-item-detail
            :run-completion
-           :completion-end)
+           :completion-end
+           :completion-mode)
   #+sbcl
   (:lock t))
 (in-package :lem/completion-mode)