From 5b88ec259ccf24b87a7c8c3d35173a2353dd8517 Mon Sep 17 00:00:00 2001 From: Theodor Thornhill Date: Mon, 30 Dec 2019 16:26:22 +0100 Subject: [PATCH] Change from symbol-at-point to thing-at-point MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * eglot.el (eglot-rename): Change from symbol-at-point to thing-at-point to avoid interning a symbol. Add "unknown symbol" to prompt when no symbol is found. Co-authored-by: João Távora GitHub-reference: close https://github.com/joaotavora/eglot/issues/385 --- lisp/progmodes/eglot.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index dc20ef751b8..4e92bf09bf2 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -2774,9 +2774,11 @@ is not active." (defun eglot-rename (newname) "Rename the current symbol to NEWNAME." (interactive - (list (read-from-minibuffer (format "Rename `%s' to: " (symbol-at-point)) - nil nil nil nil - (symbol-name (symbol-at-point))))) + (list (read-from-minibuffer + (format "Rename `%s' to: " (or (thing-at-point 'symbol t) + "unknown symbol")) + nil nil nil nil + (symbol-name (symbol-at-point))))) (unless (eglot--server-capable :renameProvider) (eglot--error "Server can't rename!")) (eglot--apply-workspace-edit -- 2.39.5