jao-clojure: fixes for test/implementation jumps

1 files changed, 9 insertions, 6 deletions

diff --git a/lib/prog/jao-clojure.el b/lib/prog/jao-clojure.el
index e044f9e..827c47d 100644
--- a/lib/prog/jao-clojure.el
+++ b/lib/prog/jao-clojure.el
@@ -51,7 +51,7 @@
   (jao-clojure--test-namespace-p (clojure-find-ns)))
 
 (defun jao-clojure--test-for (namespace sep)
-  (funcall cider-test-infer-test-ns 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)
@@ -65,20 +65,23 @@
   (interactive)
   (let* ((f (format "%s/%s/%s.%s"
                     (jao-clojure--root)
-                    (jao-clojure--ext-dir "test")
+                    "test"
                     (jao-clojure--test-for (clojure-find-ns) "/")
                     (file-name-extension buffer-file-name)))
          (f (replace-regexp-in-string "-" "_" f)))
     (find-file f)))
 
 (defun jao-clojure--implementation-for (namespace)
-  (let ((n (replace-regexp-in-string "-test$" "" namespace)))
-    (replace-regexp-in-string "\\.test\\." "." n)))
+  (thread-last (replace-regexp-in-string "-test$" "" namespace)
+               (replace-regexp-in-string "\\.test\\." ".")
+               (replace-regexp-in-string "-" "_")
+               (replace-regexp-in-string "\\." "/")
+               (substring-no-properties)))
 
 (defun jao-clojure--find-implementation (src)
-  (let ((f (format "%s/%s/%s.%s"
+  (let ((f (format "%s%s/%s.%s"
                    (jao-clojure--root)
-                   (jao-clojure--ext-dir src)
+                   src
                    (jao-clojure--implementation-for (clojure-find-ns))
                    (file-name-extension buffer-file-name))))
     (and (file-exists-p f) f)))