emacs: Replace sml-mode with sml-ts-mode

4 files changed, 13 insertions, 2 deletions

diff --git a/emacs/.config/emacs/arkta/arkta-progmodes.el b/emacs/.config/emacs/arkta/arkta-progmodes.el
index b8db189..ac7940d 100644
--- a/emacs/.config/emacs/arkta/arkta-progmodes.el
+++ b/emacs/.config/emacs/arkta/arkta-progmodes.el
@@ -274,9 +274,10 @@
   :straight t
   :mode "\\.st\\'")
 
-(use-package sml-mode
+(use-package sml-ts-mode
   :straight t
-  :mode "\\.sml\\'")
+  :mode "\\.sml\\'"
+  :hook (sml-ts-mode . arkta/disable-sp-strictness))
 
 (use-package svelte-mode
   :straight t
diff --git a/emacs/.config/emacs/arkta/arkta-treesit.el b/emacs/.config/emacs/arkta/arkta-treesit.el
index 7766c20..5df3049 100644
--- a/emacs/.config/emacs/arkta/arkta-treesit.el
+++ b/emacs/.config/emacs/arkta/arkta-treesit.el
@@ -200,6 +200,10 @@
                  ,(arkta/treesit-cond
                     (14 "v0.24.0")))
 
+          (sml "https://github.com/MatthewFluet/tree-sitter-sml"
+               ,(arkta/treesit-cond
+                  (14 "v0.23.0")))
+
           (toml "https://github.com/ikatyang/tree-sitter-toml.git"
                 ,(arkta/treesit-cond
                    (13 "v0.5.1")))
diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el
index 4c1553b..aedb379 100644
--- a/emacs/.config/emacs/init.el
+++ b/emacs/.config/emacs/init.el
@@ -74,6 +74,7 @@
                             (ruby-mode . ruby-ts-mode)
                             (rust-mode . rust-ts-mode)
                             (scala-mode . scala-ts-mode)
+                            (sml-mode . sml-ts-mode)
                             (yaml-mode . yaml-ts-mode)
                             (toml-mode . toml-ts-mode)
                             (tsx-mode . tsx-ts-mode)
@@ -444,6 +445,10 @@
 (use-package smartparens
   :straight t
   ;; See: (sp-cheat-sheet) and make some cool keybinds :)
+  :init
+  (defun arkta/disable-sp-strictness ()
+    (smartparens-strict-mode -1)
+    (smartparens-mode +1))
   :hook (prog-mode . smartparens-strict-mode)
   :config
   (require 'smartparens-config))
diff --git a/emacs/.config/emacs/straight/versions/default.el b/emacs/.config/emacs/straight/versions/default.el
index 6e57bf7..be92e83 100644
--- a/emacs/.config/emacs/straight/versions/default.el
+++ b/emacs/.config/emacs/straight/versions/default.el
@@ -67,6 +67,7 @@
  ("smalltalk-mode" . "274b17efbf0dd9962842aa9eea76b117796d17ed")
  ("smartparens" . "b629b4e893ba21ba5a381f6c0054bb72f8e96df2")
  ("sml-mode" . "c33659fd9b62fab436366f731daa4339691dd6bf")
+ ("sml-ts-mode" . "d2dabcc9d8f91eeee7048641e4c80fabb3583194")
  ("straight.el" . "0ad6fd8f37bd918c72989df18c76a68649f0a372")
  ("svelte-mode" . "ac8fba901dc790976f9893e338c8ad1241b897c6")
  ("swift-mode" . "c2fe47722fcab02a8bd40b443fc11687793591e9")