Fix font-locking of single-segment names in ns macro

Author: Bozhidar Batsov

clojure-mode.el

@@ -432,11 +432,6 @@ Called by `imenu--generic-function'."
        (2 font-lock-function-name-face nil t))
       ;; lambda arguments - %, %1, %2, etc
       ("\\<%[1-9]?" (0 font-lock-variable-name-face))
-      ;; (ns namespace)
-      (,(concat "(\\(?:clojure.core/\\)?ns[ \t]+"
-                ;; namespace
-                "\\(\\sw+\\)" )
-       (1 font-lock-type-face nil t))
       ;; Special forms & control structures
       (,(concat
          "(\\(?:clojure.core/\\)?"
@@ -496,6 +491,13 @@ Called by `imenu--generic-function'."
       ("\\(?:\\<\\|\\.\\|/\\|#?^\\)\\([A-Z][a-zA-Z0-9_]*[a-zA-Z0-9$_]+\\.?\\>\\)" 1 font-lock-type-face)
       ;; foo.bar.baz
       ("\\<^?\\([a-z][a-z0-9_-]+\\.\\([a-z][a-z0-9_-]*\\.?\\)+\\)" 1 font-lock-type-face)
+      ;; (ns namespace) - special handling for single segment namespaces
+      (,(concat "\\<ns\\>[ \r\n\t]*"
+                ;; Possibly metadata
+                "\\(?:\\^?{[^}]+}[ \r\n\t]*\\)*"
+                ;; namespace
+                "\\([a-z0-9-]+\\)")
+       (1 font-lock-type-face nil t))
       ;; foo/ Foo/ @Foo/
       ("\\<@?\\([a-zA-Z][a-z0-9_-]*\\)/" 1 font-lock-type-face)
       ;; fooBar

test/clojure-mode-test.el

@@ -214,6 +214,11 @@ POS."
   (should (eq (clojure-test-face-at 1 10 "*some-var*") 'font-lock-variable-name-face))
   (should (eq (clojure-test-face-at 2 11 "@*some-var*") 'font-lock-variable-name-face)))
 
+(ert-deftest clojure-mode-syntax-table/ns-macro ()
+  :tags '(fontification syntax-table)
+  (should (eq (clojure-test-face-at 5 8 "(ns name)") 'font-lock-type-face))
+  (should (eq (clojure-test-face-at 5 13 "(ns name.name)") 'font-lock-type-face)))
+
 (provide 'clojure-mode-test)
 
 ;; Local Variables: