@@ -896,12 +896,14 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-rename-file-or-d
896
896
(affected-buffers (when (file-directory-p old-path)
897
897
(cljr--buffers-visiting-dir old-path)))
898
898
(old-path (expand-file-name old-path))
899
- (new-path (cljr--maybe-replace-dash-in-file-name (expand-file-name new-path))))
899
+ (new-path (cljr--maybe-replace-dash-in-file-name (expand-file-name new-path)))
900
+ (nrepl-new-path (funcall cider-to-nrepl-filename-function new-path))
901
+ (nrepl-old-path (funcall cider-to-nrepl-filename-function old-path)))
900
902
(when (y-or-n-p (format "Really rename %s to %s?" old-path new-path))
901
903
(let* ((changed-files (cljr--call-middleware-sync
902
904
(cljr--create-msg "rename-file-or-dir"
903
- "old-path" old-path
904
- "new-path" new-path)
905
+ "old-path" nrepl- old-path
906
+ "new-path" nrepl- new-path)
905
907
"touched"))
906
908
(changed-files-count (length changed-files)))
907
909
(cond
@@ -2481,7 +2483,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-promote-function
2481
2483
(let* ((filename (funcall cider-to-nrepl-filename-function (buffer-file-name)))
2482
2484
(line (line-number-at-pos))
2483
2485
(column (1+ (current-column)))
2484
- (dir (cljr--project-dir))
2486
+ (dir (funcall cider-to-nrepl-filename-function ( cljr--project-dir) ))
2485
2487
(request (cljr--create-msg "find-symbol"
2486
2488
"ns" ns
2487
2489
"dir" dir
@@ -2505,7 +2507,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-promote-function
2505
2507
(let* ((filename (funcall cider-to-nrepl-filename-function (buffer-file-name)))
2506
2508
(line (line-number-at-pos))
2507
2509
(column (1+ (current-column)))
2508
- (dir (cljr--project-dir))
2510
+ (dir (funcall cider-to-nrepl-filename-function ( cljr--project-dir) ))
2509
2511
(find-symbol-request
2510
2512
(cljr--create-msg "find-symbol"
2511
2513
"ns" ns
@@ -2737,7 +2739,7 @@ removed."
2737
2739
(unless (and *cljr--noninteractive*
2738
2740
(not (buffer-modified-p)))
2739
2741
(save-buffer))
2740
- (let ((path (or path (buffer-file-name)))
2742
+ (let* ((path (funcall cider-to-nrepl-filename-function ( or path (buffer-file-name) )))
2741
2743
(relative-path (cljr--project-relative-path path)))
2742
2744
(when-let (new-ns (cljr--call-middleware-sync
2743
2745
(cljr--create-msg "clean-ns"
@@ -2975,11 +2977,12 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-hotload-dependen
2975
2977
" "))))
2976
2978
2977
2979
(defun cljr--call-middleware-to-find-used-locals (file line column)
2978
- (string-join
2979
- (cljr--call-middleware-sync
2980
- (cljr--create-msg "find-used-locals" "file" file "line" line
2981
- "column" column)
2982
- "used-locals") " "))
2980
+ (let ((file (funcall cider-to-nrepl-filename-function file)))
2981
+ (string-join
2982
+ (cljr--call-middleware-sync
2983
+ (cljr--create-msg "find-used-locals" "file" file "line" line
2984
+ "column" column)
2985
+ "used-locals") " ")))
2983
2986
2984
2987
(defun cljr--goto-enclosing-sexp ()
2985
2988
(let ((sexp-regexp (rx (or "(" "#{" "{" "["))))
0 commit comments