procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't take over mouse-1 binding on Eglot diagnostics (bug#62157)

Browse source 
It's better to give the user a variable to allow the overlay keymap to
be customized.

* lisp/progmodes/eglot.el (eglot--mouse-call): Accept second arg.
(eglot--mode-line-props): Adapt call to eglot--mouse-call
(eglot-diagnostics-map): New variable.
(eglot-code-actions-at-mouse): New command.
This commit is contained in:
João Távora 2023-03-17 22:37:27 +00:00
parent 013057e351
commit 3293f93988
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lisp/progmodes/eglot.el
View file

@ -1948,8 +1948,8 @@ If it is activated, also signal textDocument/didOpen."
(put 'eglot--mode-line-format 'risky-local-variable t) (put 'eglot--mode-line-format 'risky-local-variable t)
(defun eglot--mouse-call (what) (defun eglot--mouse-call (what &optional update-mode-line)
"Make an interactive lambda for calling WHAT from mode-line." "Make an interactive lambda for calling WHAT with the mouse."
(lambda (event) (lambda (event)
(interactive "e") (interactive "e")
(let ((start (event-start event))) (with-selected-window (posn-window start) (let ((start (event-start event))) (with-selected-window (posn-window start)
@ -1957,7 +1957,8 @@ If it is activated, also signal textDocument/didOpen."
(goto-char (or (posn-point start) (goto-char (or (posn-point start)
(point))) (point)))
(call-interactively what) (call-interactively what)
(force-mode-line-update t)))))) (when update-mode-line
(force-mode-line-update t)))))))
(defun eglot-manual () "Open documentation." (defun eglot-manual () "Open documentation."
(declare (obsolete info "29.1")) (declare (obsolete info "29.1"))
@ -2031,7 +2032,7 @@ Uses THING, FACE, DEFS and PREPEND."
(cl-loop with map = (make-sparse-keymap) (cl-loop with map = (make-sparse-keymap)
for (elem . rest) on defs for (elem . rest) on defs
for (key def help) = elem for (key def help) = elem
do (define-key map `[mode-line ,key] (eglot--mouse-call def)) do (define-key map `[mode-line ,key] (eglot--mouse-call def t))
concat (format "%s: %s" key help) into blurb concat (format "%s: %s" key help) into blurb
when rest concat "\n" into blurb when rest concat "\n" into blurb
finally (return `(:propertize ,thing finally (return `(:propertize ,thing
@ -2092,15 +2093,18 @@ still unanswered LSP requests to the server\n"))))))))
(defalias 'eglot--make-diag 'flymake-make-diagnostic) (defalias 'eglot--make-diag 'flymake-make-diagnostic)
(defalias 'eglot--diag-data 'flymake-diagnostic-data) (defalias 'eglot--diag-data 'flymake-diagnostic-data)
(defvar eglot-diagnostics-map
(let ((map (make-sparse-keymap)))
(define-key map [mouse-2] 'eglot-code-actions-at-mouse)
map)
"Map active in Eglot-backed Flymake diagnostic overlays.")
(cl-loop for i from 1 (cl-loop for i from 1
for type in '(eglot-note eglot-warning eglot-error) for type in '(eglot-note eglot-warning eglot-error)
do (put type 'flymake-overlay-control do (put type 'flymake-overlay-control
`((mouse-face . highlight) `((mouse-face . highlight)
(priority . ,(+ 50 i)) (priority . ,(+ 50 i))
(keymap . ,(let ((map (make-sparse-keymap))) (keymap . ,eglot-diagnostics-map))))
(define-key map [mouse-1]
(eglot--mouse-call 'eglot-code-actions))
map)))))
;;; Protocol implementation (Requests, notifications, etc) ;;; Protocol implementation (Requests, notifications, etc)
@ -3342,6 +3346,9 @@ at point. With prefix argument, prompt for ACTION-KIND."
(eglot--read-execute-code-action actions server action-kind) (eglot--read-execute-code-action actions server action-kind)
actions))) actions)))
(defalias 'eglot-code-actions-at-mouse (eglot--mouse-call 'eglot-code-actions)
"Like `eglot-code-actions', but intended for mouse events.")
(defun eglot--read-execute-code-action (actions server &optional action-kind) (defun eglot--read-execute-code-action (actions server &optional action-kind)
"Helper for interactive calls to `eglot-code-actions'." "Helper for interactive calls to `eglot-code-actions'."
(let* ((menu-items (let* ((menu-items