Merge pull request #509 from carlosgeos/fix-508

[Fix #508] correct font-lock for namespace name

Author: cichli

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 * Dynamic vars whose names contain non-alphanumeric characters are now font-locked correctly.
 * [#445 (comment)](https://github.com/clojure-emacs/clojure-mode/issues/445#issuecomment-340460753): Proper font lock for namespaced keywords like for example `(s/def ::keyword)`
+* [#508](https://github.com/clojure-emacs/clojure-mode/issues/508): Fix font lock for namespaces with metadata
 
 ## 5.10.0 (2019-01-05)
 

clojure-mode.el

@@ -861,8 +861,8 @@ any number of matches of `clojure--sym-forbidden-rest-chars'."))
 
       ;; namespace definitions: (ns foo.bar)
       (,(concat "(\\<ns\\>[ \r\n\t]*"
-                ;; Possibly metadata
-                "\\(?:\\^?{[^}]+}[ \r\n\t]*\\)*"
+                ;; Possibly metadata, shorthand and/or longhand
+                "\\(?:\\^?\\(?:{[^}]+}\\|:[^ \r\n\t]+[ \r\n\t]\\)[ \r\n\t]*\\)*"
                 ;; namespace
                 "\\(" clojure--sym-regexp "\\)")
        (1 font-lock-type-face))

test/clojure-mode-font-lock-test.el

@@ -149,7 +149,14 @@ POS."
   (should (eq (clojure-test-face-at 5 11 "(ns Foo-bar)") 'font-lock-type-face))
   (should (eq (clojure-test-face-at 5 11 "(ns Foo-Bar)") 'font-lock-type-face))
   (should (eq (clojure-test-face-at 5 11 "(ns foo-Bar)") 'font-lock-type-face))
-  (should (eq (clojure-test-face-at 5 9  "(ns one.X)") 'font-lock-type-face)))
+  (should (eq (clojure-test-face-at 5 9  "(ns one.X)") 'font-lock-type-face))
+  (should (eq (clojure-test-face-at 10 16 "(ns ^:md ns-name)") 'font-lock-type-face))
+  (should (eq (clojure-test-face-at 13 19 "(ns ^:md \n  ns-name)") 'font-lock-type-face))
+  (should (eq (clojure-test-face-at 17 23 "(ns ^:md1 ^:md2 ns-name)") 'font-lock-type-face))
+  (should (eq (clojure-test-face-at 24 30 "(ns ^:md1 ^{:md2 true} ns-name)") 'font-lock-type-face))
+  (should (eq (clojure-test-face-at 24 30 "(ns ^{:md2 true} ^:md1 ns-name)") 'font-lock-type-face))
+  (should (eq (clojure-test-face-at 27 33 "(ns ^:md1 ^{:md2 true} \n  ns-name)") 'font-lock-type-face))
+  (should (eq (clojure-test-face-at 27 33 "(ns ^{:md2 true} ^:md1 \n  ns-name)") 'font-lock-type-face)))
 
 (ert-deftest clojure-mode-syntax-table/oneword ()
   :tags '(fontification syntax-table)