mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Eglot: fix textDocument/prepareRename support

Browse source 
Can't send prepareRename requests willy-nilly.

See https://github.com/joaotavora/eglot/issues/1554.

* lisp/progmodes/eglot.el (eglot--rename-interactive): Fix.
(eglot-client-capabilities): Advertise "prepareSupport".

* etc/EGLOT-NEWS: Mention change.
This commit is contained in:
João Távora 2026-01-21 11:57:38 +00:00
parent f643ad53c7
commit 9d8e1af6f4
2 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
etc/EGLOT-NEWS
View file

@ -50,6 +50,11 @@ beneficial and helps servers avoid costly useless work.
Eglot now sets 'imenu-create-index-function' directly without using
advice, making the integration cleaner and more predictable.
** Fixed textDocument/prepareRename support (github#1554)
Eglot now properly checks server capabilities before sending
prepareRename requests.
* Changes in Eglot 1.21 (11/1/2026)

38
lisp/progmodes/eglot.el
View file

@ -1139,7 +1139,8 @@ object."
:isPreferredSupport t)
:formatting `(:dynamicRegistration :json-false)
:rangeFormatting `(:dynamicRegistration :json-false)
:rename `(:dynamicRegistration :json-false)
:rename `(:dynamicRegistration :json-false
:prepareSupport t)
:semanticTokens `(:dynamicRegistration :json-false
:requests (:full (:delta t))
:overlappingTokenSupport t
@ -4489,20 +4490,27 @@ the edit was attempted and optionally why not."
(if (user-accepts-p) (apply-all) `(nil "decision to decline")))
((apply-all)))))))
(cl-defun eglot--rename-interactive (&aux region)
(eglot-server-capable-or-lose :renameProvider)
(let* ((probe (eglot--request (eglot--current-server-or-lose)
:textDocument/prepareRename
(eglot--TextDocumentPositionParams)))
(def
(cond ((null probe) (user-error "[eglot] Can't rename here"))
((plist-get probe :placeholder))
((plist-get probe :defaultBehavior) (thing-at-point 'symbol t))
((setq region (eglot-range-region probe))
(buffer-substring-no-properties (car region) (cdr region))))))
(list (read-from-minibuffer
(format "Rename `%s' to: " (or def "unknown symbol"))
nil nil nil nil def))))
(cl-defun eglot--rename-interactive
(&aux
def region
(rename-support (eglot-server-capable-or-lose :renameProvider))
(prepare-support (and (listp rename-support)
(plist-get rename-support :prepareProvider))))
(setq
def
(cond (prepare-support
(let ((x (eglot--request (eglot--current-server-or-lose)
:textDocument/prepareRename
(eglot--TextDocumentPositionParams))))
(cond ((null x) (user-error "[eglot] Can't rename here"))
((plist-get x :placeholder))
((plist-get x :defaultBehavior) (thing-at-point 'symbol t))
((setq region (eglot-range-region x))
(buffer-substring-no-properties (car region) (cdr region))))))
(t (thing-at-point 'symbol t))))
(list (read-from-minibuffer
(format "Rename `%s' to: " (or def "unknown symbol"))
nil nil nil nil def)))
(defun eglot-rename (newname)
"Rename the current symbol to NEWNAME."