Merge pull request #510 from carlosgeos/fix-comment-in-445

[Fix comment in #445] Proper font lock in (s/def ::keyword)

Author: cichli

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Bugs fixed
 
 * 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)`
 
 ## 5.10.0 (2019-01-05)
 

clojure-mode.el

@@ -785,7 +785,7 @@ any number of matches of `clojure--sym-forbidden-rest-chars'."))
                 "[ \r\n\t]*"
                 ;; Possibly type or metadata
                 "\\(?:#?^\\(?:{[^}]*}\\|\\sw+\\)[ \r\n\t]*\\)*"
-                "\\(\\sw+\\)?")
+                (concat "\\(" clojure--sym-regexp "\\)?"))
        (1 font-lock-keyword-face)
        (2 font-lock-function-name-face nil t))
       ;; (fn name? args ...)

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

@@ -709,7 +709,13 @@ POS."
     (should (eq (clojure-test-face-at 2 4) 'font-lock-type-face))
     (should (eq (clojure-test-face-at 5 5) nil))
     (should (eq (clojure-test-face-at 6 11) 'font-lock-keyword-face))
-    (should (eq (clojure-test-face-at 13 15) 'font-lock-function-name-face))))
+    (should (eq (clojure-test-face-at 13 15) 'font-lock-function-name-face)))
+  (clojure-test-with-temp-buffer "(s/def ::keyword)"
+    (should (eq (clojure-test-face-at 2 2) 'font-lock-type-face))
+    (should (eq (clojure-test-face-at 3 3) nil))
+    (should (eq (clojure-test-face-at 4 6) 'font-lock-keyword-face))
+    (should (eq (clojure-test-face-at 8 16) 'clojure-keyword-face))))
+
 
 (ert-deftest clojure-mode-syntax-table/variable-def ()
   :tags '(fontification syntax-table)