branch: elpa/cider
commit 856a35cf97f0709e0e0e10b9b79d0cc345b13c70
Author: vemv <v...@users.noreply.github.com>
Commit: vemv <v...@users.noreply.github.com>
Don't lose the CIDER session over TRAMP files
Fixes https://github.com/clojure-emacs/cider/issues/3250
---
CHANGELOG.md | 1 +
cider-connection.el | 2 ++
test/cider-common-tests.el | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index efd32c4c1a..7196c4c277 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
- [#3402](https://github.com/clojure-emacs/cider/issues/3402): fix
`cider-format-connection-params` edge case for Emacs 29.
- [#3393](https://github.com/clojure-emacs/cider/issues/3393): Recompute
namespace info on each shadow-cljs recompilation or evaluation.
- Recompute namespace info on each fighweel-main recompilation.
+- [#3250](https://github.com/clojure-emacs/cider/issues/3250): don't lose the
CIDER session over TRAMP files.
- Fix the `xref-find-definitions` CIDER backend to return correct filenames.
- Fix the `cider-xref-fn-deps` buttons to direct to the right file.
- Make TRAMP functionality work when using non-standard ports.
diff --git a/cider-connection.el b/cider-connection.el
index 765d915ced..9c0c093508 100644
--- a/cider-connection.el
+++ b/cider-connection.el
@@ -624,6 +624,8 @@ REPL defaults to the current REPL."
(when (string-match-p "#uzip" file)
(let ((avfs-path (directory-file-name (expand-file-name (or (getenv
"AVFSBASE") "~/.avfs/")))))
(setq file (replace-regexp-in-string avfs-path "" file t t))))
+ (when-let ((tp (cider-tramp-prefix (current-buffer))))
+ (setq file (string-remove-prefix tp file)))
(when (process-live-p proc)
(let* ((classpath (or (process-get proc :cached-classpath)
(let ((cp (with-current-buffer repl
diff --git a/test/cider-common-tests.el b/test/cider-common-tests.el
index 92df2bbe71..de2d25e1b6 100644
--- a/test/cider-common-tests.el
+++ b/test/cider-common-tests.el
@@ -72,7 +72,7 @@
(expect (cider-make-tramp-prefix "ssh" "cider-devs" "192.168.50.9#22")
:to-equal "/ssh:cider-devs@192.168.50.9#22:")
(expect (cider-make-tramp-prefix "ssh" "cider-devs" "192.168.50.9")
- :to-equal "/ssh:cider-devs@192.168.50.9#22:")
+ :to-equal "/ssh:cider-devs@192.168.50.9:")
(expect (cider-make-tramp-prefix "ssh" "cider-devs" "192.168.50.9"
"12345")
:to-equal "/ssh:cider-devs@192.168.50.9#12345:")
(expect (cider-make-tramp-prefix "ssh" "cider-devs" "192.168.50.9#12345")
