Skip to content

Fix all derived modes #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 15, 2024
Merged

Fix all derived modes #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## main (unreleased)

- [#37]: Fix derived modes broken with [#36]

## 0.2.1 (2024-02-14)

- [#36]: Rename all derived mode vars to match the package prefix.
Expand Down
22 changes: 11 additions & 11 deletions clojure-ts-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,51 +968,51 @@ See `clojure-ts--font-lock-settings' for usage of MARKDOWN-AVAILABLE."
(define-derived-mode clojure-ts-clojurescript-mode clojure-ts-mode "ClojureScript[TS]"
"Major mode for editing ClojureScript code.

\\{clojurescript-ts-mode-map}")
\\{clojure-ts-clojurescript-mode-map}")

;;;###autoload
(define-derived-mode clojure-ts-clojurec-mode clojure-ts-mode "ClojureC[TS]"
"Major mode for editing ClojureC code.

\\{clojurec-ts-mode-map}")
\\{clojure-ts-clojurec-mode-map}")

;;;###autoload
(define-derived-mode clojure-ts-clojuredart-mode clojure-ts-mode "ClojureDart[TS]"
"Major mode for editing Clojure Dart code.

\\{clojure-dart-ts-mode-map}")
\\{clojure-ts-clojuredart-mode-map}")

;;;###autoload
(define-derived-mode clojure-ts-jank-mode clojure-ts-mode "Jank[TS]"
"Major mode for editing Jank code.

\\{clojure-jank-ts-mode-map}")
\\{clojure-ts-jank-mode-map}")

(defun clojure-ts--register-novel-modes ()
"Set up Clojure modes not present in progenitor clojure-mode.el."
(add-to-list 'auto-mode-alist '("\\.cljd\\'" . clojure-dart-ts-mode))
(add-to-list 'auto-mode-alist '("\\.jank\\'" . clojure-jank-ts-mode)))
(add-to-list 'auto-mode-alist '("\\.cljd\\'" . clojure-ts-clojuredart-mode))
(add-to-list 'auto-mode-alist '("\\.jank\\'" . clojure-ts-jank-mode)))

;; Redirect clojure-mode to clojure-ts-mode if clojure-mode is present
(if (require 'clojure-mode nil 'noerror)
(progn
(add-to-list 'major-mode-remap-alist '(clojure-mode . clojure-ts-mode))
(add-to-list 'major-mode-remap-alist '(clojurescript-mode . clojurescript-ts-mode))
(add-to-list 'major-mode-remap-alist '(clojurec-mode . clojurec-ts-mode))
(add-to-list 'major-mode-remap-alist '(clojurescript-mode . clojure-ts-clojurescript-mode))
(add-to-list 'major-mode-remap-alist '(clojurec-mode . clojure-ts-clojurec-mode))
(clojure-ts--register-novel-modes))
;; Clojure-mode is not present, setup auto-modes ourselves
;; Regular clojure/edn files
;; I believe dtm is for datomic queries and datoms, which are just edn.
(add-to-list 'auto-mode-alist
'("\\.\\(clj\\|dtm\\|edn\\)\\'" . clojure-ts-mode))
(add-to-list 'auto-mode-alist '("\\.cljs\\'" . clojurescript-ts-mode))
(add-to-list 'auto-mode-alist '("\\.cljc\\'" . clojurec-ts-mode))
(add-to-list 'auto-mode-alist '("\\.cljs\\'" . clojure-ts-clojurescript-mode))
(add-to-list 'auto-mode-alist '("\\.cljc\\'" . clojure-ts-clojurec-mode))
;; boot build scripts are Clojure source files
(add-to-list 'auto-mode-alist '("\\(?:build\\|profile\\)\\.boot\\'" . clojure-ts-mode))
;; babashka scripts are Clojure source files
(add-to-list 'interpreter-mode-alist '("bb" . clojure-ts-mode))
;; nbb scripts are ClojureScript source files
(add-to-list 'interpreter-mode-alist '("nbb" . clojurescript-ts-mode))
(add-to-list 'interpreter-mode-alist '("nbb" . clojure-ts-clojurescript-mode))
(clojure-ts--register-novel-modes))

(defvar clojure-ts--find-ns-query
Expand Down