[Fix #349] Indent and font-lock (let|when|while)-* forms

Author: Malabarba

clojure-mode.el

@@ -426,6 +426,12 @@ Called by `imenu--generic-function'."
             "declare") t)
          "\\>")
        1 font-lock-keyword-face)
+      ;; Macros similar to let, when, and while
+      (,(rx symbol-start
+            (or "let" "when" "while") "-"
+            (1+ (or (syntax word) (syntax symbol)))
+            symbol-end)
+       0 font-lock-keyword-face)
       (,(concat
          "\\<"
          (regexp-opt
@@ -667,7 +673,10 @@ symbol properties."
         (or (get (intern-soft (match-string 1 function-name))
                  'clojure-indent-function)
             (get (intern-soft (match-string 1 function-name))
-                 'clojure-backtracking-indent)))))
+                 'clojure-backtracking-indent)))
+      (when (string-match (rx (or "let" "when" "while") (syntax symbol))
+                          function-name)
+        (clojure--get-indent-method (substring (match-string 0 function-name) 0 -1)))))
 
 (defvar clojure--current-backtracking-depth 0)
 

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

@@ -124,6 +124,12 @@ POS."
   (should (equal (clojure-test-face-at 8 8 "{:a.ias/some 20}")  '(default clojure-keyword-face)))
   (should (equal (clojure-test-face-at 9 12 "{:a.ias/some 20}") '(clojure-keyword-face))))
 
+(ert-deftest clojure-mode-syntax-table/fontify-let-when-while-type-forms ()
+  :tags '(fontification syntax-table)
+  (should (equal (clojure-test-face-at 2 11 "(when-alist [x 1]\n  ())") 'font-lock-keyword-face))
+  (should (equal (clojure-test-face-at 2 11 "(while-alist [x 1]\n  ())") 'font-lock-keyword-face))
+  (should (equal (clojure-test-face-at 2 11 "(let-alist [x 1]\n  ())") 'various-faces)))
+
 (ert-deftest clojure-mode-syntax-table/type ()
   :tags '(fontification syntax-table)
   (should (eq (clojure-test-face-at 1 9 "SomeClass") 'font-lock-type-face)))

test/clojure-mode-indentation-test.el

@@ -335,6 +335,10 @@ values of customisable variables."
   "(msg' 1
       10)")
 
+(def-full-indent-test let-when-while-forms
+  "(let-alist [x 1]\n  ())"
+  "(while-alist [x 1]\n  ())"
+  "(when-alist [x 1]\n  ())")
 
 (defun indent-cond (indent-point state)
   (goto-char (elt state 1))