Skip to content

Commit b082a03

Browse files
committed
Don't pass in translations
1 parent 2042a80 commit b082a03

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

cider-common.el

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ container, the alist would be `((\"/src\" \"~/projects/foo/src\"))"
265265
:group 'cider
266266
:package-version '(cider . "0.22.0"))
267267

268-
(defun cider--translate-docker (path translations)
268+
(defun cider--translate-docker (path)
269269
"Attempt to translate the PATH.
270270
Looks at `cider-docker-translations' for (docker . host) alist of path
271271
prefixes. TRANSLATIONS is an alist of docker prefix to host prefix."
@@ -274,7 +274,7 @@ prefixes. TRANSLATIONS is an alist of docker prefix to host prefix."
274274
(replace-regexp-in-string (format "^%s" (file-name-as-directory (car translation)))
275275
(file-name-as-directory (cdr translation))
276276
path)))
277-
translations))
277+
cider-docker-translations))
278278

279279
(defvar cider-from-nrepl-filename-function
280280
(with-no-warnings
@@ -293,7 +293,7 @@ prefixes. TRANSLATIONS is an alist of docker prefix to host prefix."
293293
If no local or remote file exists, return nil."
294294
(let* ((local-path (funcall cider-from-nrepl-filename-function path))
295295
(tramp-path (and local-path (cider--client-tramp-filename local-path)))
296-
(reverse-docker-path (cider--translate-docker local-path cider-docker-translations)))
296+
(reverse-docker-path (cider--translate-docker local-path)))
297297
(cond ((equal local-path "") "")
298298
((and reverse-docker-path (file-exists-p reverse-docker-path)) reverse-docker-path)
299299
((and cider-prefer-local-resources (file-exists-p local-path))

test/cider-common-tests.el

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,22 @@
7575
(expect (cider-make-tramp-prefix "ssh" nil "test.local")
7676
:to-equal "/ssh:test.local:")))
7777

78+
(defun cider--translate-docker-test (translations file)
79+
(let ((cider-docker-translations translations))
80+
(cider--translate-docker file)))
81+
7882
(describe "cider--translate-docker"
7983
(it "translates filepaths from docker location to host location"
80-
(expect (cider--translate-docker "/docker/src/namespace.clj"
81-
'(("/docker/src" . "/home/host/project/src")))
84+
(expect (cider--translate-docker-test '(("/docker/src" . "/home/host/project/src")) "/docker/src/namespace.clj")
8285
:to-equal "/home/host/project/src/namespace.clj"))
8386
(it "returns nil if no prefixes match"
84-
(expect (cider--translate-docker "/home/host/random/file.clj"
85-
'(("/docker/src" . "/home/host/project/src")))
87+
(expect (cider--translate-docker-test '(("/docker/src" . "/home/host/project/src")) "/home/host/random/file.clj")
8688
:to-equal nil))
8789
(it "won't replace a prefix in the middle of the path"
88-
(expect (cider--translate-docker "/src/project/src/ns.clj" '(("/src" . "/host")))
90+
(expect (cider--translate-docker-test '(("/src" . "/host")) "/src/project/src/ns.clj")
8991
:to-equal "/host/project/src/ns.clj"))
9092
(it "ensures the prefix has a slash"
91-
(expect (cider--translate-docker "/docker/ns.clj" '(("/docker" . "/host")))
92-
:to-equal (cider--translate-docker "/docker/ns.clj" '(("/docker/" . "/host/"))))))
93+
(expect (cider--translate-docker-test '(("/docker" . "/host")) "/docker/ns.clj")
94+
:to-equal "/host/ns.clj")))
9395

9496

0 commit comments

Comments
 (0)