Drop support for cljx

Clojure 1.7 has been around for 3 years now and it's pretty safe
to assume almost no one is still using cljx at this point.

Author: bbatsov

CHANGELOG.md

@@ -11,6 +11,10 @@
 * New defcustom `clojure-comment-regexp` for font-locking `#_` or `#_` AND `(comment)` sexps.
 * [#459](https://github.com/clojure-emacs/clojure-mode/issues/459): Add font-locking for new built-ins added in Clojure 1.9.
 
+### Changes
+
+* Drop support for CLJX.
+
 ### Bugs fixed
 
 * [#458](https://github.com/clojure-emacs/clojure-mode/pull/458): Get correct ns when in middle of ns form with `clojure-find-ns`

README.md

@@ -72,7 +72,6 @@ The `clojure-mode` package actually bundles together several major modes:
 * `clojure-mode` is a major mode for editing Clojure code
 * `clojurescript-mode` is a major mode for editing ClojureScript code
 * `clojurec-mode` is a major mode for editing `.cljc` source files
-* `clojurex-mode` is a major mode for editing `.cljx` source files
 
 All the major modes derive from `clojure-mode` and provide more or less the same
 functionality.  Differences can be found mostly in the font-locking -

clojure-mode.el

@@ -567,10 +567,7 @@ non-nil."
                            'clojurescript-mode)
                           ((and (string-match "\\.cljc\\'" (buffer-file-name))
                                 (not (eq major-mode 'clojurec-mode)))
-                           'clojurec-mode)
-                          ((and (string-match "\\.cljx\\'" (buffer-file-name))
-                                (not (eq major-mode 'clojurex-mode)))
-                           'clojurex-mode))))
+                           'clojurec-mode))))
       (when problem
         (message "[WARNING] %s activated `%s' instead of `%s' in this buffer.
 This could cause problems.
@@ -2474,24 +2471,11 @@ With a numeric prefix argument the let is introduced N lists up."
 
 \\{clojurec-mode-map}")
 
-(defconst clojurex-font-lock-keywords
-  ;; cljx annotations (#+clj and #+cljs)
-  '(("#\\+cljs?\\>" 0 font-lock-preprocessor-face))
-  "Additional font-locking for `clojurex-mode'.")
-
-;;;###autoload
-(define-derived-mode clojurex-mode clojure-mode "ClojureX"
-  "Major mode for editing ClojureX code.
-
-\\{clojurex-mode-map}"
-  (font-lock-add-keywords nil clojurex-font-lock-keywords))
-
 ;;;###autoload
 (progn
   (add-to-list 'auto-mode-alist
                '("\\.\\(clj\\|dtm\\|edn\\)\\'" . clojure-mode))
   (add-to-list 'auto-mode-alist '("\\.cljc\\'" . clojurec-mode))
-  (add-to-list 'auto-mode-alist '("\\.cljx\\'" . clojurex-mode))
   (add-to-list 'auto-mode-alist '("\\.cljs\\'" . clojurescript-mode))
   ;; boot build scripts are Clojure source files
   (add-to-list 'auto-mode-alist '("\\(?:build\\|profile\\)\\.boot\\'" . clojure-mode)))

test.clj

@@ -25,13 +25,6 @@
 (FooBar/bar)
 (some.package.FooBar/baz)
 
-;; cljx
-(defn x-to-string
-  [x]
-  (let [buf #+clj (StringBuilder.) #+cljs (gstring/StringBuffer.)]
-    (.append buf "x is: ")
-    (.append buf (str x))))
-
 ;; metadata doesn't break docstrings
 (defn max
   "Returns the greatest of the nums."

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

@@ -41,17 +41,6 @@
      (goto-char (point-min))
      ,@body))
 
-(defmacro clojurex-test-with-temp-buffer (content &rest body)
-  "Evaluate BODY in a temporary buffer with CONTENTS."
-  (declare (debug t)
-           (indent 1))
-  `(with-temp-buffer
-     (insert ,content)
-     (clojurex-mode)
-     (font-lock-fontify-buffer)
-     (goto-char (point-min))
-     ,@body))
-
 (defun clojure-get-face-at-range (start end)
   (let ((start-face (get-text-property start 'face))
         (all-faces (cl-loop for i from start to end collect (get-text-property i 'face))))
@@ -69,16 +58,6 @@ buffer."
         (clojure-get-face-at-range start end))
     (clojure-get-face-at-range start end)))
 
-(defun clojurex-test-face-at (start end &optional content)
-  "Get the face between START and END in CONTENT.
-
-If CONTENT is not given, return the face at the specified range in the current
-buffer."
-  (if content
-      (clojurex-test-with-temp-buffer content
-                                      (clojure-get-face-at-range start end))
-    (clojure-get-face-at-range start end)))
-
 (defconst clojure-test-syntax-classes
   [whitespace punctuation word symbol open-paren close-paren expression-prefix
               string-quote paired-delim escape character-quote comment-start
@@ -322,11 +301,6 @@ POS."
   (should (eq (clojure-test-face-at 1 2 "\\,") 'clojure-character-face))
   (should (eq (clojure-test-face-at 1 2 "\\;") 'clojure-character-face)))
 
-(ert-deftest clojurex-mode-syntax-table/cljx ()
-  :tags '(fontification syntax-table)
-  (should (eq (clojurex-test-face-at 1 5 "#+clj x") 'font-lock-preprocessor-face))
-  (should (eq (clojurex-test-face-at 1 6 "#+cljs x") 'font-lock-preprocessor-face)))
-
 (ert-deftest clojure-mode-syntax-table/refer-ns ()
   :tags '(fontification syntax-table)
   (should (eq (clojure-test-face-at 1 3 "foo/var") 'font-lock-type-face))