From 7f618b309cdd801aea03f8fdb4abee50389fbf8a Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Fri, 14 Apr 2023 01:59:49 +0100 Subject: [PATCH] feat(language/toml): use toml-ts-mode if available --- modules/languages/siren-toml.el | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/modules/languages/siren-toml.el b/modules/languages/siren-toml.el index b80d71e..a758a72 100644 --- a/modules/languages/siren-toml.el +++ b/modules/languages/siren-toml.el @@ -11,12 +11,25 @@ (use-package conf-toml-mode :straight (:type built-in) :mode "\\.toml\\'" "Cargo\\.lock\\'" - :hook (conf-toml-mode . siren-toml-mode-setup) + :hook (conf-toml-mode . siren-toml-mode-setup)) - :preface - (defun siren-toml-mode-setup () - (run-hooks 'prog-mode-hook) - (setq-local tab-width 2))) +;; Use built-in treesit support if available. +(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) + + :init + (require 'siren-treesit) + (siren-treesit-prepare + 'toml-ts-mode + '(toml "https://github.com/tree-sitter/tree-sitter-toml")))) + +(defun siren-toml-mode-setup () + (run-hooks 'prog-mode-hook) + (setq-local tab-width 2)) (provide 'siren-toml) ;;; siren-toml.el ends here