clojure other file: improvements

1 files changed, 10 insertions, 5 deletions

diff --git a/lib/prog/jao-clojure.el b/lib/prog/jao-clojure.el
index 796c35d..8faa6b1 100644
--- a/lib/prog/jao-clojure.el
+++ b/lib/prog/jao-clojure.el
@@ -53,7 +53,8 @@
   (jao-clojure--test-namespace-p (clojure-find-ns)))
 
 (defun jao-clojure--test-for (namespace sep)
-  (replace-regexp-in-string "\\." sep (cider-test-default-test-ns-fn namespace)))
+  (replace-regexp-in-string "\\." sep
+                            (cider-test-default-test-ns-fn namespace)))
 
 (defun jao-clojure--infer-test-ns (ns)
   (if (jao-clojure--test-namespace-p ns)
@@ -62,15 +63,19 @@
 
 (defun jao-clojure--root () (project-root (project-current)))
 
+(defun jao-clojure--to-fname (x)
+  (replace-regexp-in-string "-" "_" x))
+
 (defun jao-clojure-jump-to-test ()
   "Jump from implementation to test file."
   (interactive)
-  (let* ((f (format "%s/%s/%s.%s"
+  (let* ((tn (jao-clojure--test-for (clojure-find-ns) "/"))
+         (bn (file-name-extension buffer-file-name))
+         (f (format "%s%s/%s.%s"
                     (jao-clojure--root)
                     "test"
-                    (jao-clojure--test-for (clojure-find-ns) "/")
-                    (file-name-extension buffer-file-name)))
-         (f (replace-regexp-in-string "-" "_" f)))
+                    (jao-clojure--to-fname tn)
+                    (jao-clojure--to-fname bn))))
     (find-file f)))
 
 (defun jao-clojure--implementation-for (namespace)