From 7f0dcec93a8273a61c0c1554caeebc2a11fd72a0 Mon Sep 17 00:00:00 2001
From: p4v4n <pavan.mantha99@gmail.com>
Date: Thu, 15 Feb 2024 05:29:17 +0530
Subject: [PATCH] Fix all derived modes

- after breaking them earlier in this PR
https://github.com/clojure-emacs/clojure-ts-mode/pull/36
---
 CHANGELOG.md       |  2 ++
 clojure-ts-mode.el | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e5df56..63ea2dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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.
diff --git a/clojure-ts-mode.el b/clojure-ts-mode.el
index 0700640..97a9345 100644
--- a/clojure-ts-mode.el
+++ b/clojure-ts-mode.el
@@ -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