emacs: Replace php-mode with php-ts-mode

4 files changed, 22 insertions, 3 deletions

diff --git a/emacs/.config/emacs/arkta/arkta-progmodes.el b/emacs/.config/emacs/arkta/arkta-progmodes.el
index d6bdbe2..ea2f411 100644
--- a/emacs/.config/emacs/arkta/arkta-progmodes.el
+++ b/emacs/.config/emacs/arkta/arkta-progmodes.el
@@ -202,8 +202,8 @@
   (org-agenda-files '("~/TODO.org"))
   (org-log-done t))
 
-(use-package php-mode
-  :straight t
+(use-package php-ts-mode
+  :straight '(php-ts-mode :type built-in)
   :mode "\\.php\\'")
 
 (use-package pico8-mode
diff --git a/emacs/.config/emacs/arkta/arkta-treesit.el b/emacs/.config/emacs/arkta/arkta-treesit.el
index 7a7e200..631268b 100644
--- a/emacs/.config/emacs/arkta/arkta-treesit.el
+++ b/emacs/.config/emacs/arkta/arkta-treesit.el
@@ -141,6 +141,10 @@
                 ,(arkta/treesit-cond
                    (14 "v0.8.0")))
 
+          (html "https://github.com/tree-sitter/tree-sitter-html"
+                ,(arkta/treesit-cond
+                   (14 "v0.23.2")))
+
           (java "https://github.com/tree-sitter/tree-sitter-java.git"
                 ,(arkta/treesit-cond
                    (14 "v0.23.5")))
@@ -150,6 +154,11 @@
                          (15 "v0.25.0")
                          (14 "v0.23.1")))
 
+          (jsdoc "https://github.com/tree-sitter/tree-sitter-jsdoc"
+                 ,(arkta/treesit-cond
+                    (15 "v0.25.0")
+                    (14 "v0.23.2")))
+
           (json "https://github.com/tree-sitter/tree-sitter-json.git"
                 ,(arkta/treesit-cond
                    (14 "v0.24.8")))
@@ -163,6 +172,16 @@
                   (15 "v0.4.0")
                   (14 "v0.3.0")))
 
+          (php "https://github.com/tree-sitter/tree-sitter-php"
+               ,(arkta/treesit-cond
+                  (15 "v0.24.2")
+                  (14 "v0.23.12"))
+               "php/src")
+
+          (phpdoc "https://github.com/claytonrcarter/tree-sitter-phpdoc"
+                  ,(arkta/treesit-cond
+                     (14 "v0.1.6")))
+
           (python "https://github.com/tree-sitter/tree-sitter-python.git"
                   ,(arkta/treesit-cond
                      (15 "v0.25.0")
diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el
index a478918..237fb49 100644
--- a/emacs/.config/emacs/init.el
+++ b/emacs/.config/emacs/init.el
@@ -69,6 +69,7 @@
                             (js-mode . js-ts-mode)
                             (json-mode . json-ts-mode)
                             (lua-mode . lua-ts-mode)
+                            (php-mode . php-ts-mode)
                             (python-mode . python-ts-mode)
                             (ruby-mode . ruby-ts-mode)
                             (rust-mode . rust-ts-mode)
diff --git a/emacs/.config/emacs/straight/versions/default.el b/emacs/.config/emacs/straight/versions/default.el
index 60d2577..19bd8c3 100644
--- a/emacs/.config/emacs/straight/versions/default.el
+++ b/emacs/.config/emacs/straight/versions/default.el
@@ -55,7 +55,6 @@
  ("nix-mode" . "719feb7868fb567ecfe5578f6119892c771ac5e5")
  ("nongnu-elpa" . "f5b312b749043106a17f388ea3d153239b9bd541")
  ("pfuture" . "19b53aebbc0f2da31de6326c495038901bffb73c")
- ("php-mode" . "7ed83bcd339a253c7471504f227543270a394eeb")
  ("pico8-mode" . "e276c65352f294679af62148df41f36dac744426")
  ("popper" . "49f4904480cf4ca5c6db83fcfa9e6ea8d4567d96")
  ("posframe" . "12f540c9ad5da09673b2bca1132b41f94c134e82")