Skip to content

Commit e4fbe8b

Browse files
committed
lsp-rename': move user-error' into `interactive'
"rename is invalid here" makes no sense if `lsp-rename' is not called interactively.
1 parent 4ee0e68 commit e4fbe8b

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

lsp-mode.el

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5667,9 +5667,11 @@ renaming is supported but cannot be done at point."
56675667

56685668
(defun lsp-rename (newname)
56695669
"Rename the symbol (and all references to it) under point to NEWNAME."
5670-
(interactive (list (-when-let ((symbol . placeholder) (lsp--get-symbol-to-rename))
5671-
(read-string (format "Rename %s to: " symbol) placeholder nil symbol))))
5672-
(unless newname (user-error "`lsp-rename' is invalid here"))
5670+
(interactive
5671+
(-if-let ((symbol . placeholder) (lsp--get-symbol-to-rename))
5672+
(list (read-string (format "Rename %s to: " symbol)
5673+
placeholder nil symbol))
5674+
(user-error "`lsp-rename' is invalid here")))
56735675
(when-let ((edits (lsp-request "textDocument/rename"
56745676
`( :textDocument ,(lsp--text-document-identifier)
56755677
:position ,(lsp--cur-position)

0 commit comments

Comments
 (0)