From 19a2ddbe367c235671dd76243fd4b5f867b25557 Mon Sep 17 00:00:00 2001 From: p4v4n Date: Mon, 4 Sep 2023 08:36:34 +0530 Subject: [PATCH 1/4] Fix clojure-find-ns - when ns is preceded by whitespace or inside comment form. --- CHANGELOG.md | 4 ++++ clojure-mode.el | 6 ++++-- test/clojure-mode-util-test.el | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50b7455c..29c61ee3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## master (unreleased) +### Bugs fixed + +* [#593](https://github.com/clojure-emacs/clojure-mode/issues/593): Fix clojure-find-ns when ns form is preceded by whitespace or inside comment form. + ## 5.16.2 (2023-08-23) ### Changes diff --git a/clojure-mode.el b/clojure-mode.el index 8e7b3626..8f3ece50 100644 --- a/clojure-mode.el +++ b/clojure-mode.el @@ -2125,7 +2125,7 @@ content) are considered part of the preceding sexp." (make-obsolete-variable 'clojure-namespace-name-regex 'clojure-namespace-regexp "5.12.0") (defconst clojure-namespace-regexp - (rx line-start "(" (? "clojure.core/") (or "in-ns" "ns" "ns+") symbol-end)) + (rx line-start (zero-or-more whitespace) "(" (? "clojure.core/") (or "in-ns" "ns" "ns+") symbol-end)) (defcustom clojure-cache-ns nil "Whether to cache the results of `clojure-find-ns'. @@ -2153,7 +2153,7 @@ DIRECTION is `forward' or `backward'." (save-match-data (goto-char end) (clojure-forward-logical-sexp) - (unless (or (clojure--in-string-p) (clojure--in-comment-p)) + (unless (or (clojure--in-string-p) (clojure--in-comment-p) (clojure-top-level-form-p "comment")) (setq candidate (string-remove-prefix "'" (thing-at-point 'symbol)))))))) candidate)) @@ -2275,6 +2275,8 @@ This will skip over sexps that don't represent objects, so that ^hints and (condition-case nil (save-excursion (beginning-of-defun) + (clojure-forward-logical-sexp 1) + (clojure-backward-logical-sexp 1) (forward-char 1) (clojure-forward-logical-sexp 1) (clojure-backward-logical-sexp 1) diff --git a/test/clojure-mode-util-test.el b/test/clojure-mode-util-test.el index a35babbe..1ba56ea4 100644 --- a/test/clojure-mode-util-test.el +++ b/test/clojure-mode-util-test.el @@ -82,6 +82,21 @@ (expect (clojure-find-ns) :to-equal "foo")) (with-clojure-buffer "(ns ^:bar ^:baz foo)" (expect (clojure-find-ns) :to-equal "foo"))) + (it "should find namespaces with spaces before ns form" + (with-clojure-buffer " (ns foo)" + (expect (clojure-find-ns) :to-equal "foo"))) + (it "should skip namespaces within any comment forms" + (with-clojure-buffer " (ns foo) + (comment + (ns bar))" + (expect (clojure-find-ns) :to-equal "foo")) + (with-clojure-buffer " (comment + (ns foo)) + (ns bar) + (comment + (ns baz))" + (expect (clojure-find-ns) :to-equal "bar")) + ) (it "should find namespace declarations with nested metadata and docstrings" (with-clojure-buffer "(ns ^{:bar true} foo)" (expect (clojure-find-ns) :to-equal "foo")) From 48c4a67dfee70d4f90d6326c23ad5fd52296ba83 Mon Sep 17 00:00:00 2001 From: p4v4n Date: Mon, 4 Sep 2023 19:04:42 +0530 Subject: [PATCH 2/4] Add comments --- clojure-mode.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/clojure-mode.el b/clojure-mode.el index 8f3ece50..797426c1 100644 --- a/clojure-mode.el +++ b/clojure-mode.el @@ -2275,9 +2275,11 @@ This will skip over sexps that don't represent objects, so that ^hints and (condition-case nil (save-excursion (beginning-of-defun) + ;; Go to beginning of sexp (clojure-forward-logical-sexp 1) (clojure-backward-logical-sexp 1) (forward-char 1) + ;; Go to beginning of operator (clojure-forward-logical-sexp 1) (clojure-backward-logical-sexp 1) (looking-at-p first-form)) From ba3f756160ce10fe544a9019c52d811eadfc60ac Mon Sep 17 00:00:00 2001 From: p4v4n Date: Wed, 6 Sep 2023 23:41:28 +0530 Subject: [PATCH 3/4] Cleanup --- clojure-mode.el | 4 ---- 1 file changed, 4 deletions(-) diff --git a/clojure-mode.el b/clojure-mode.el index 1514a05f..43030a1d 100644 --- a/clojure-mode.el +++ b/clojure-mode.el @@ -2275,11 +2275,7 @@ This will skip over sexps that don't represent objects, so that ^hints and (condition-case nil (save-excursion (beginning-of-defun-raw) - ;; Go to beginning of sexp - (clojure-forward-logical-sexp 1) - (clojure-backward-logical-sexp 1) (forward-char 1) - ;; Go to beginning of operator (clojure-forward-logical-sexp 1) (clojure-backward-logical-sexp 1) (looking-at-p first-form)) From 06ecbc8400960e4f166a926af79c4de47118f28b Mon Sep 17 00:00:00 2001 From: p4v4n Date: Thu, 7 Sep 2023 03:10:38 +0530 Subject: [PATCH 4/4] Add 1 more test case --- test/clojure-mode-util-test.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/clojure-mode-util-test.el b/test/clojure-mode-util-test.el index 1ba56ea4..3f6e2de7 100644 --- a/test/clojure-mode-util-test.el +++ b/test/clojure-mode-util-test.el @@ -86,6 +86,9 @@ (with-clojure-buffer " (ns foo)" (expect (clojure-find-ns) :to-equal "foo"))) (it "should skip namespaces within any comment forms" + (with-clojure-buffer "(comment + (ns foo))" + (expect (clojure-find-ns) :to-equal nil)) (with-clojure-buffer " (ns foo) (comment (ns bar))" @@ -95,8 +98,7 @@ (ns bar) (comment (ns baz))" - (expect (clojure-find-ns) :to-equal "bar")) - ) + (expect (clojure-find-ns) :to-equal "bar"))) (it "should find namespace declarations with nested metadata and docstrings" (with-clojure-buffer "(ns ^{:bar true} foo)" (expect (clojure-find-ns) :to-equal "foo"))