emacs: Replace swift-mode with swift-ts-mode

4 files changed, 7 insertions, 3 deletions

diff --git a/emacs/.config/emacs/arkta/arkta-progmodes.el b/emacs/.config/emacs/arkta/arkta-progmodes.el
index ac7940d..6d3b28a 100644
--- a/emacs/.config/emacs/arkta/arkta-progmodes.el
+++ b/emacs/.config/emacs/arkta/arkta-progmodes.el
@@ -283,8 +283,7 @@
   :straight t
   :mode ("\\.svelte\\'" "\\.svx\\'"))
 
-(use-package swift-mode
-  ;; There's swift-ts-mode... but it doesn't have parser.c committed...
+(use-package swift-ts-mode
   :straight t
   :mode "\\.swift\\'")
 
diff --git a/emacs/.config/emacs/arkta/arkta-treesit.el b/emacs/.config/emacs/arkta/arkta-treesit.el
index 5df3049..4e56da9 100644
--- a/emacs/.config/emacs/arkta/arkta-treesit.el
+++ b/emacs/.config/emacs/arkta/arkta-treesit.el
@@ -204,6 +204,10 @@
                ,(arkta/treesit-cond
                   (14 "v0.23.0")))
 
+          (swift "https://github.com/alex-pinkus/tree-sitter-swift"
+                 ,(arkta/treesit-cond
+                    (14 "0.7.1-with-generated-files")))
+
           (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 aedb379..4e407fc 100644
--- a/emacs/.config/emacs/init.el
+++ b/emacs/.config/emacs/init.el
@@ -75,6 +75,7 @@
                             (rust-mode . rust-ts-mode)
                             (scala-mode . scala-ts-mode)
                             (sml-mode . sml-ts-mode)
+                            (swift-mode . swift-ts-mode)
                             (yaml-mode . yaml-ts-mode)
                             (toml-mode . toml-ts-mode)
                             (tsx-mode . tsx-ts-mode)
diff --git a/emacs/.config/emacs/straight/versions/default.el b/emacs/.config/emacs/straight/versions/default.el
index be92e83..383bce7 100644
--- a/emacs/.config/emacs/straight/versions/default.el
+++ b/emacs/.config/emacs/straight/versions/default.el
@@ -70,7 +70,7 @@
  ("sml-ts-mode" . "d2dabcc9d8f91eeee7048641e4c80fabb3583194")
  ("straight.el" . "0ad6fd8f37bd918c72989df18c76a68649f0a372")
  ("svelte-mode" . "ac8fba901dc790976f9893e338c8ad1241b897c6")
- ("swift-mode" . "c2fe47722fcab02a8bd40b443fc11687793591e9")
+ ("swift-ts-mode" . "17806f6f56f09c86c5e70af239bea4313aaaf0b8")
  ("swiper" . "2257a9d0519e18f5ce7a7fafda8a1a8e5023628e")
  ("transient" . "1d2710c7f8bba962bfbe6502d76158c2150840c1")
  ("treemacs" . "05333cc23ca4349cd839cf1c18e1eaef1f6b70ec")