aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2024-06-06 23:26:25 +0300
committerDmitry Gutov2024-06-06 23:35:20 +0300
commitb571c6571c8bc4c34569650104aee273c19cbfd4 (patch)
tree40c54dbbd91f46aa27a80ec89e21a78dd0eb8822
parent91f51f5ac5e6343359ffcadc8341b8da767aab87 (diff)
downloademacs-b571c6571c8bc4c34569650104aee273c19cbfd4.tar.gz
emacs-b571c6571c8bc4c34569650104aee273c19cbfd4.zip
eglot-reconnect: Re-fetch the current project
* lisp/progmodes/eglot.el (eglot-reconnect): Retrieve the current project just in case something changed (bug#70724).
-rw-r--r--lisp/progmodes/eglot.el14
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 5ccae5210fe..f58a895a3f1 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1419,11 +1419,15 @@ INTERACTIVE is t if called interactively."
1419 (interactive (list (eglot--current-server-or-lose) t)) 1419 (interactive (list (eglot--current-server-or-lose) t))
1420 (when (jsonrpc-running-p server) 1420 (when (jsonrpc-running-p server)
1421 (ignore-errors (eglot-shutdown server interactive nil 'preserve-buffers))) 1421 (ignore-errors (eglot-shutdown server interactive nil 'preserve-buffers)))
1422 (eglot--connect (eglot--major-modes server) 1422 (let* ((default-directory (project-root (eglot--project server)))
1423 (eglot--project server) 1423 (project (eglot--current-project)))
1424 (eieio-object-class-name server) 1424 (if (not project)
1425 (eglot--saved-initargs server) 1425 (eglot--error "Project in `%s' is gone!" default-directory)
1426 (eglot--language-ids server)) 1426 (eglot--connect (eglot--major-modes server)
1427 project
1428 (eieio-object-class-name server)
1429 (eglot--saved-initargs server)
1430 (eglot--language-ids server))))
1427 (eglot--message "Reconnected!")) 1431 (eglot--message "Reconnected!"))
1428 1432
1429(defvar eglot--managed-mode) ; forward decl 1433(defvar eglot--managed-mode) ; forward decl