chore(language/toml): don't install conf-toml-mode if toml-ts-mode is…

… available
jimeh · May 26, 2024 · fe47210 · fe47210
1 parent eec29b6
commit fe47210
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/modules/languages/siren-toml.el b/modules/languages/siren-toml.el
@@ -8,21 +8,21 @@
 
 (require 'siren-prog-mode)
 
-(use-package conf-toml-mode
-  :straight (:type built-in)
-  :mode "\\.toml\\'" "Cargo\\.lock\\'"
-  :hook (conf-toml-mode . siren-toml-mode-setup))
-
 ;; Requires Emacs 29.x or later for built-in treesit support.
-(when (fboundp 'toml-ts-mode)
-  (require 'siren-treesit)
+(if (fboundp 'toml-ts-mode)
   (use-package toml-ts-mode
     :straight (:type built-in)
     :mode "\\.toml\\'" "Cargo\\.lock\\'"
     :hook
     (toml-ts-mode . siren-toml-mode-setup)
+    :preface
+    (require 'siren-treesit)
     :config
-    (siren-treesit-auto-ensure-grammar 'toml)))
+    (siren-treesit-auto-ensure-grammar 'toml))
+  (use-package conf-toml-mode
+    :straight (:type built-in)
+    :mode "\\.toml\\'" "Cargo\\.lock\\'"
+    :hook (conf-toml-mode . siren-toml-mode-setup)))
 
 (defun siren-toml-mode-setup ()
   "Default tweaks for `toml-mode'."