From 074ac916ab172599be3c8db2d04c2137f3b4f374 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Thu, 24 Oct 2024 02:03:08 +0100
Subject: [PATCH] feat(language/toml): switch to toml-ts-mode and enable
 lsp-mode as well

---
 modules/formatting/siren-prettier-js.el |  5 +--
 modules/languages/siren-toml.el         | 54 ++++++++++++++++---------
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/modules/formatting/siren-prettier-js.el b/modules/formatting/siren-prettier-js.el
index 627a48c..5af559d 100644
--- a/modules/formatting/siren-prettier-js.el
+++ b/modules/formatting/siren-prettier-js.el
@@ -9,13 +9,10 @@
 (use-package prettier-js
   :defer t
   :hook
-  ((conf-toml-mode
-    css-mode
+  ((css-mode
     markdown-mode
     php-mode
     typescript-mode
-    toml-mode
-    toml-ts-mode
     vue-mode) . siren-prettier-js-mode-enable)
 
   :custom
diff --git a/modules/languages/siren-toml.el b/modules/languages/siren-toml.el
index 649ea2f..f373ce6 100644
--- a/modules/languages/siren-toml.el
+++ b/modules/languages/siren-toml.el
@@ -7,30 +7,46 @@
 ;;; Code:
 
 (require 'siren-prog-mode)
-
-;; TODO: Revisit toml-ts-mode at some point the future. It's a bit buggy at the
-;; moment.
-;;
-;; (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)))
-
-(use-package conf-toml-mode
-  :straight (:type built-in)
-  :mode "\\.toml\\'" "Cargo\\.lock\\'"
-  :hook (conf-toml-mode . siren-toml-mode-setup))
+(require 'siren-treesit)
 
 (defun siren-toml-mode-setup ()
   "Default tweaks for `toml-mode'."
   (run-hooks 'prog-mode-hook)
   (setq-local tab-width 2))
 
+(use-package conf-toml-mode
+  :straight (:type built-in)
+  :mode "\\.toml\\'" "Cargo\\.lock\\'"
+  :hook
+  (conf-toml-mode . siren-toml-mode-setup))
+
+(if (fboundp 'toml-ts-mode)
+    (use-package toml-ts-mode
+      :straight (:type built-in)
+      ;; TODO: Revisit toml-ts-mode at some point the future. It's a bit buggy
+      ;; at the moment.
+      :mode "\\.toml\\'" "Cargo\\.lock\\'"
+
+      :hook
+      (toml-ts-mode . siren-toml-mode-setup)
+
+      :custom
+      (toml-ts-mode-indent-offset 2)
+
+      :config
+      (siren-treesit-auto-ensure-grammar 'toml)))
+
+(use-package lsp-toml
+  :straight lsp-mode
+  :hook
+  (toml-mode . siren-lsp-lua-mode-setup)
+  (toml-ts-mode . siren-lsp-lua-mode-setup)
+
+  :preface
+  (defun siren-lsp-lua-mode-setup ()
+    (lsp-format-buffer-on-save-mode t)
+    (lsp-deferred))
+)
+
 (provide 'siren-toml)
 ;;; siren-toml.el ends here