Merge pull request #350 from expez/update-ns-regexp

Make the ns regexp more permissive

Author: bbatsov

CHANGELOG.md

@@ -2,8 +2,14 @@
 
 ## master (unreleased)
 
+### New features
+
 * Indent and font-lock forms that start with `let-`, `while-` or `when-` like their counterparts.
 
+### Bugs fixed
+
+* Namespaces can now use the full palette of legal symbol characters.
+
 ## 5.0.1 (15/11/2015)
 
 ### Bugs fixed

clojure-mode.el

@@ -1016,32 +1016,8 @@ nil."
                         (zero-or-more "^:"
                                       (one-or-more (not (any whitespace)))))
                     (one-or-more (any whitespace "\n")))
-      ;; why is this here? oh (in-ns 'foo) or (ns+ :user)
-      (zero-or-one (any ":'"))
-      (group (one-or-more (not (any "()\"" whitespace))) word-end)))
-
-;; for testing clojure-namespace-name-regex, you can evaluate this code and make
-;; sure foo (or whatever the namespace name is) shows up in results. some of
-;; these currently fail.
-;; (mapcar (lambda (s) (let ((n (string-match clojure-namespace-name-regex s)))
-;;                       (if n (match-string 4 s))))
-;;         '("(ns foo)"
-;;           "(ns
-;; foo)"
-;;           "(ns foo.baz)"
-;;           "(ns ^:bar foo)"
-;;           "(ns ^:bar ^:baz foo)"
-;;           "(ns ^{:bar true} foo)"
-;;           "(ns #^{:bar true} foo)"
-;;           "(ns #^{:fail {}} foo)"
-;;           "(ns ^{:fail2 {}} foo.baz)"
-;;           "(ns ^{} foo)"
-;;           "(ns ^{:skip-wiki true}
-;;   aleph.netty
-;; "
-;;           "(ns
-;;  foo)"
-;;     "foo"))
+      (zero-or-one (any ":'")) ;; (in-ns 'foo) or (ns+ :user)
+      (group (one-or-more (not (any "()\"" whitespace))) symbol-end)))
 
 
 

test/clojure-mode-util-test.el

@@ -53,6 +53,48 @@
                          (clojure-expected-ns))
                        clj-file-ns)))))
 
+(ert-deftest clojure-namespace-name-regex-test ()
+  :tags '(regexp)
+  (let ((ns "(ns foo)"))
+    (should (string-match clojure-namespace-name-regex ns))
+    (match-string 4 ns))
+  (let ((ns "(ns
+foo)"))
+    (should (string-match clojure-namespace-name-regex ns))
+    (should (equal "foo" (match-string 4 ns))))
+  (let ((ns "(ns foo.baz)"))
+    (should (string-match clojure-namespace-name-regex ns))
+    (should (equal "foo.baz" (match-string 4 ns))))
+  (let ((ns "(ns ^:bar foo)"))
+    (should (string-match clojure-namespace-name-regex ns))
+    (should (equal "foo" (match-string 4 ns))))
+  (let ((ns "(ns ^:bar ^:baz foo)"))
+    (should (string-match clojure-namespace-name-regex ns))
+    (should (equal "foo" (match-string 4 ns))))
+  (let ((ns "(ns ^{:bar true} foo)"))
+    (should (string-match clojure-namespace-name-regex ns))
+    (should (equal "foo" (match-string 4 ns))))
+  (let ((ns "(ns #^{:bar true} foo)"))
+    (should (string-match clojure-namespace-name-regex ns))
+    (should (equal "foo" (match-string 4 ns))))
+  ;; TODO
+  ;; (let ((ns "(ns #^{:fail {}} foo)"))
+  ;;   (should (string-match clojure-namespace-name-regex ns))
+  ;;   (match-string 4 ns))
+  ;; (let ((ns "(ns ^{:fail2 {}} foo.baz)"))
+  ;;   (should (string-match clojure-namespace-name-regex ns))
+  ;;   (should (equal "foo.baz" (match-string 4 ns))))
+  (let ((ns "(ns ^{} foo)"))
+    (should (string-match clojure-namespace-name-regex ns))
+    (should (equal "foo" (match-string 4 ns))))
+  (let ((ns "(ns ^{:skip-wiki true}
+  aleph.netty"))
+    (should (string-match clojure-namespace-name-regex ns))
+    (should (equal "aleph.netty" (match-string 4 ns))))
+  (let ((ns "(ns foo+)"))
+    (should (string-match clojure-namespace-name-regex ns))
+    (should (equal "foo+" (match-string 4 ns)))))
+
 (provide 'clojure-mode-util-test)
 
 ;; Local Variables: