Skip to content

Commit a34c168

Browse files
committed
Merge pull request #157 from technomancy/refine-clojure-test-maybe-enable
Makes clojure-test-maybe-enable more discriminating.
2 parents 89222f3 + 295d1c5 commit a34c168

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

clojure-test-mode.el

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -522,15 +522,25 @@ Clojure src file for the given test namespace.")
522522

523523
(add-hook 'nrepl-connected-hook 'clojure-test-load-reporting)
524524

525+
(defconst clojure-test-regex
526+
(rx "clojure.test"))
527+
528+
(defun clojure-find-clojure-test ()
529+
(let ((regexp clojure-test-regex))
530+
(save-restriction
531+
(save-excursion
532+
(save-match-data
533+
(goto-char (point-min))
534+
(when (re-search-forward regexp nil t)
535+
(match-string-no-properties 0)))))))
536+
525537
;;;###autoload
526538
(progn
527539
(defun clojure-test-maybe-enable ()
528-
"Enable clojure-test-mode if the current buffer contains a namespace
529-
with a \"test.\" bit on it."
530-
(let ((ns (clojure-find-package))) ; defined in clojure-mode.el
531-
(when (and ns (string-match "test\\(\\.\\|$\\)" ns))
532-
(save-window-excursion
533-
(clojure-test-mode t)))))
540+
"Enable clojure-test-mode if the current buffer contains a \"clojure.test\" bit in it."
541+
(when (clojure-find-clojure-test)
542+
(save-window-excursion
543+
(clojure-test-mode t))))
534544

535545
(add-hook 'clojure-mode-hook 'clojure-test-maybe-enable))
536546

0 commit comments

Comments
 (0)