Skip to content

Commit 05a4e1e

Browse files
committed
Remove special handling for jank and clojuredart modes
This aligns clojure-ts-mode with some changes I did recently in clojure-mode.
1 parent 71ddb1d commit 05a4e1e

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

clojure-ts-mode.el

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,9 @@ values like this:
269269
(defvar clojure-ts-mode-remappings
270270
'((clojure-mode . clojure-ts-mode)
271271
(clojurescript-mode . clojure-ts-clojurescript-mode)
272-
(clojurec-mode . clojure-ts-clojurec-mode))
272+
(clojurec-mode . clojure-ts-clojurec-mode)
273+
(clojuredart-mode . clojure-ts-clojuredart-mode)
274+
(jank-mode . clojure-ts-jank-mode))
273275
"Alist of entries to `major-mode-remap-defaults'.
274276
275277
See also `clojure-ts-activate-mode-remappings' and
@@ -2970,11 +2972,6 @@ REGEX-AVAILABLE."
29702972
(clojure-ts--add-config-for-mode 'c++-ts-mode)
29712973
(treesit-major-mode-setup)))
29722974

2973-
(defun clojure-ts--register-novel-modes ()
2974-
"Set up Clojure modes not present in progenitor clojure-mode.el."
2975-
(add-to-list 'auto-mode-alist '("\\.cljd\\'" . clojure-ts-clojuredart-mode))
2976-
(add-to-list 'auto-mode-alist '("\\.jank\\'" . clojure-ts-jank-mode)))
2977-
29782975
(defun clojure-ts-activate-mode-remappings ()
29792976
"Remap all `clojure-mode' file-specified modes to use `clojure-ts-mode'.
29802977
@@ -2995,10 +2992,8 @@ Useful if you want to switch to the `clojure-mode's mode mappings."
29952992
(if (treesit-available-p)
29962993
;; Redirect clojure-mode to clojure-ts-mode if clojure-mode is present
29972994
(if (require 'clojure-mode nil 'noerror)
2998-
(progn
2999-
(when clojure-ts-auto-remap
3000-
(clojure-ts-activate-mode-remappings))
3001-
(clojure-ts--register-novel-modes))
2995+
(when clojure-ts-auto-remap
2996+
(clojure-ts-activate-mode-remappings))
30022997
;; When Clojure-mode is not present, setup auto-modes ourselves
30032998
(progn
30042999
;; Regular clojure/edn files
@@ -3007,13 +3002,14 @@ Useful if you want to switch to the `clojure-mode's mode mappings."
30073002
'("\\.\\(clj\\|dtm\\|edn\\)\\'" . clojure-ts-mode))
30083003
(add-to-list 'auto-mode-alist '("\\.cljs\\'" . clojure-ts-clojurescript-mode))
30093004
(add-to-list 'auto-mode-alist '("\\.cljc\\'" . clojure-ts-clojurec-mode))
3005+
(add-to-list 'auto-mode-alist '("\\.cljd\\'" . clojure-ts-clojuredart-mode))
3006+
(add-to-list 'auto-mode-alist '("\\.jank\\'" . clojure-ts-jank-mode))
30103007
;; boot build scripts are Clojure source files
30113008
(add-to-list 'auto-mode-alist '("\\(?:build\\|profile\\)\\.boot\\'" . clojure-ts-mode))
30123009
;; babashka scripts are Clojure source files
30133010
(add-to-list 'interpreter-mode-alist '("bb" . clojure-ts-mode))
30143011
;; nbb scripts are ClojureScript source files
3015-
(add-to-list 'interpreter-mode-alist '("nbb" . clojure-ts-clojurescript-mode))
3016-
(clojure-ts--register-novel-modes)))
3012+
(add-to-list 'interpreter-mode-alist '("nbb" . clojure-ts-clojurescript-mode))))
30173013
(message "Clojure TS Mode will not be activated as Tree-sitter support is missing."))
30183014

30193015
(defvar clojure-ts--find-ns-query

0 commit comments

Comments
 (0)