Merge pull request #505 from carlosgeos/fix-445

[Fix #445] def form with strings and docstrings

Author: cichli

CHANGELOG.md

@@ -8,6 +8,7 @@
 * [#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
 * [#506](https://github.com/clojure-emacs/clojure-mode/issues/506): `clojure-mode-display-version` correctly displays the package's version
+* [#445](https://github.com/clojure-emacs/clojure-mode/issues/445), [#405](https://github.com/clojure-emacs/clojure-mode/issues/405), [#469](https://github.com/clojure-emacs/clojure-mode/issues/469): Correct font-lock on string definitions with docstrings, e.g: `(def foo "doc" "value")`. Correct indentation as well.
 
 ## 5.10.0 (2019-01-05)
 

clojure-mode.el

@@ -958,7 +958,13 @@ highlighted region)."
                              (setq docelt (1- docelt)))))
                        (and (zerop docelt) (<= (point) startpos)
                             (progn (forward-comment (point-max)) t)
-                            (= (point) (nth 8 state)))))
+                            (= (point) (nth 8 state))))
+                     ;; In a def, at last position is not a docstring
+                     (not (and (string= "def" firstsym)
+                               (save-excursion
+                                 (goto-char startpos)
+                                 (goto-char (+ startpos (length (sexp-at-point)) 2))
+                                 (looking-at "[ \r\n\t]*\)")))))
                 font-lock-doc-face
               font-lock-string-face))))
     font-lock-comment-face))

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

@@ -731,6 +731,34 @@ POS."
   (should (eq (clojure-test-face-at 6 8 "(def foo 10)")
               'font-lock-variable-name-face)))
 
+(ert-deftest clojure-mode-syntax-table/variable-def-string ()
+  :tags '(fontification syntax-table)
+  (should (eq (clojure-test-face-at 10 16 "(def foo \"hello\")")
+              'font-lock-string-face))
+  (should (eq (clojure-test-face-at 10 16 "(def foo \"hello\"   )")
+              'font-lock-string-face))
+  (should (eq (clojure-test-face-at 13 19 "(def foo \n  \"hello\")")
+              'font-lock-string-face))
+  (should (eq (clojure-test-face-at 13 19 "(def foo \n  \"hello\"\n)")
+              'font-lock-string-face)))
+
+(ert-deftest clojure-mode-syntax-table/variable-def-string-with-docstring ()
+  :tags '(fontification syntax-table)
+  (should (eq (clojure-test-face-at 10 16 "(def foo \"usage\" \"hello\")")
+              'font-lock-doc-face))
+  (should (eq (clojure-test-face-at 18 24 "(def foo \"usage\" \"hello\")")
+              'font-lock-string-face))
+  (should (eq (clojure-test-face-at 18 24 "(def foo \"usage\" \"hello\"   )")
+              'font-lock-string-face))
+  (should (eq (clojure-test-face-at 21 27 "(def foo \"usage\" \n  \"hello\")")
+              'font-lock-string-face))
+  (should (eq (clojure-test-face-at 13 19 "(def foo \n  \"usage\" \"hello\")")
+              'font-lock-doc-face))
+  (should (eq (clojure-test-face-at 13 19 "(def foo \n  \"usage\" \n  \"hello\")")
+              'font-lock-doc-face))
+  (should (eq (clojure-test-face-at 24 30 "(def foo \n  \"usage\" \n  \"hello\")")
+              'font-lock-string-face)))
+
 (ert-deftest clojure-mode-syntax-table/type-def ()
   :tags '(fontification syntax-table)
   (clojure-test-with-temp-buffer "(deftype Foo)"

test/clojure-mode-indentation-test.el

@@ -68,6 +68,7 @@ values of customisable variables."
            (search-forward "|")
            (delete-char -1)
            (clojure-mode)
+           (font-lock-ensure)
            (indent-according-to-mode)
 
            (should (equal expected-state (buffer-string)))
@@ -118,6 +119,10 @@ values of customisable variables."
 (->>
  |expr)")
 
+(check-indentation no-indent-for-def-string
+  "(def foo \"hello|\")"
+  "(def foo \"hello|\")")
+
 (check-indentation doc-strings-without-indent-specified
   "
 (defn some-fn