Skip to content

Fix: Properly clean up track-mouse when mouse tracking is disabled #796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Properly clean up track-mouse when mouse tracking is disabled #796

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions lsp-ui-doc.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ HEIGHT is the documentation number of lines."

(defun lsp-ui-doc--make-request ()
"Request the documentation to the LS."
(and (not track-mouse) lsp-ui-doc-show-with-mouse (setq-local track-mouse t))
;; Note: track-mouse is managed by lsp-ui-doc--setup-mouse, not here
(when (and lsp-ui-doc-show-with-cursor
(not (memq this-command lsp-ui-doc--ignore-commands))
(not (bound-and-true-p lsp-ui-peek-mode))
Expand Down Expand Up @@ -1165,7 +1165,10 @@ If nil, do not prevent mouse on prefix keys.")
(setq lsp-ui-doc--timer-mouse-idle
(run-with-idle-timer 0 t 'lsp-ui-doc--disable-mouse-on-prefix))))
(t
(define-key lsp-ui-doc-mode-map (kbd "<mouse-movement>") nil))))
(define-key lsp-ui-doc-mode-map (kbd "<mouse-movement>") nil)
;; Clear track-mouse when mouse tracking is disabled
(when (and lsp-ui-doc--mouse-tracked-by-us track-mouse)
(setq-local track-mouse nil)))))

(defun lsp-ui-doc--prevent-focus-doc (e)
(not (frame-parameter (cadr e) 'lsp-ui-doc--no-focus)))
Expand Down Expand Up @@ -1200,7 +1203,10 @@ If nil, do not prevent mouse on prefix keys.")
(remove-hook 'window-state-change-functions 'lsp-ui-doc--on-state-changed))
(remove-hook 'window-scroll-functions 'lsp-ui-doc--handle-scroll t)
(remove-hook 'post-command-hook 'lsp-ui-doc--make-request t)
(remove-hook 'delete-frame-functions 'lsp-ui-doc--on-delete t))))
(remove-hook 'delete-frame-functions 'lsp-ui-doc--on-delete t)
;; Clean up track-mouse if it was set by us
(when (and lsp-ui-doc--mouse-tracked-by-us track-mouse)
(setq-local track-mouse nil)))))

(defun lsp-ui-doc-enable (enable)
"Enable/disable ‘lsp-ui-doc-mode’.
Expand Down