From 41f369ce26b5918282dbfda79e1cb25be6e15412 Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Mon, 27 Oct 2025 11:24:53 +0200 Subject: emacs: Make both treesit ABI 13 & 14 required --- emacs/.config/emacs/arkta/arkta-progmodes.el | 1 - emacs/.config/emacs/arkta/arkta-treesit.el | 62 ++++++++++------------------ 2 files changed, 22 insertions(+), 41 deletions(-) (limited to 'emacs') diff --git a/emacs/.config/emacs/arkta/arkta-progmodes.el b/emacs/.config/emacs/arkta/arkta-progmodes.el index 8fa7624..78da860 100644 --- a/emacs/.config/emacs/arkta/arkta-progmodes.el +++ b/emacs/.config/emacs/arkta/arkta-progmodes.el @@ -299,7 +299,6 @@ (use-package typst-ts-mode :after treesit - :when (arkta/treesit-supports 14) :straight t :mode "\\.typ\\'") diff --git a/emacs/.config/emacs/arkta/arkta-treesit.el b/emacs/.config/emacs/arkta/arkta-treesit.el index 2a33d8f..7fc19f8 100644 --- a/emacs/.config/emacs/arkta/arkta-treesit.el +++ b/emacs/.config/emacs/arkta/arkta-treesit.el @@ -14,8 +14,8 @@ (defun arkta/treesit-supports (&rest wanted-versions) (-any? #'arkta/treesit-supports-single wanted-versions)) - (unless (arkta/treesit-supports 13) - (error "Your treesitter library does not support ABI version 13!")) + (unless (arkta/treesit-supports 13 14) + (error "Your treesitter library does not support ABI versions 13 & 14!")) (defmacro arkta/treesit-cond (&rest body) (declare (indent 0)) @@ -92,89 +92,73 @@ `((c "https://github.com/tree-sitter/tree-sitter-c.git" ,(arkta/treesit-cond (15 "v0.24.1") - (14 "v0.23.6") - (13 "v0.19.0"))) + (14 "v0.23.6"))) (cmake "https://github.com/uyha/tree-sitter-cmake.git" ,(arkta/treesit-cond - (14 "v0.7.2") - (13 "0.1.0"))) + (14 "v0.7.2"))) (cpp "https://github.com/tree-sitter/tree-sitter-cpp.git" ,(arkta/treesit-cond - (14 "v0.23.4") - (13 "v0.19.0"))) + (14 "v0.23.4"))) (c-sharp "https://github.com/tree-sitter/tree-sitter-c-sharp.git" ,(arkta/treesit-cond - (14 "v0.23.1") - (13 "v0.20.0"))) + (14 "v0.23.1"))) (css "https://github.com/tree-sitter/tree-sitter-css.git" ,(arkta/treesit-cond (15 "v0.25.0") - (14 "v0.23.2") - (13 "v0.19.0"))) + (14 "v0.23.2"))) (dockerfile "https://github.com/camdencheek/tree-sitter-dockerfile.git" ,(arkta/treesit-cond - (14 "v0.2.0") - (13 "v0.1.2"))) + (14 "v0.2.0"))) (go "https://github.com/tree-sitter/tree-sitter-go.git" ,(arkta/treesit-cond (15 "v0.25.0") - (14 "v0.23.4") - (13 "v0.19.1"))) + (14 "v0.23.4"))) (gomod "https://github.com/camdencheek/tree-sitter-go-mod.git" ,(arkta/treesit-cond - (14 "v1.1.0") - (13 "v1.0.0"))) + (14 "v1.1.0"))) (java "https://github.com/tree-sitter/tree-sitter-java.git" ,(arkta/treesit-cond - (14 "v0.23.5") - (13 "v0.19.1"))) + (14 "v0.23.5"))) (javascript "https://github.com/tree-sitter/tree-sitter-javascript.git" ,(arkta/treesit-cond (15 "v0.25.0") - (14 "v0.23.1") - (13 "v0.19.0"))) + (14 "v0.23.1"))) (json "https://github.com/tree-sitter/tree-sitter-json.git" ,(arkta/treesit-cond - (14 "v0.24.8") - (13 "v0.19.0"))) + (14 "v0.24.8"))) (kotlin "https://github.com/fwcd/tree-sitter-kotlin.git" ,(arkta/treesit-cond - (14 "0.3.8") - (13 "0.2.11"))) + (14 "0.3.8"))) (lua "https://github.com/tree-sitter-grammars/tree-sitter-lua" ,(arkta/treesit-cond (15 "v0.4.0") - (14 "v0.3.0") - (13 "v0.0.15"))) + (14 "v0.3.0"))) (python "https://github.com/tree-sitter/tree-sitter-python.git" ,(arkta/treesit-cond (15 "v0.25.0") - (14 "v0.23.6") - (13 "v0.19.0"))) + (14 "v0.23.6"))) (ruby "https://github.com/tree-sitter/tree-sitter-ruby.git" ,(arkta/treesit-cond - (14 "v0.23.1") - (13 "v0.19.0"))) + (14 "v0.23.1"))) (rust "https://github.com/tree-sitter/tree-sitter-rust.git" ,(arkta/treesit-cond (15 "v0.24.0") - (14 "v0.23.3") - (13 "v0.19.1"))) + (14 "v0.23.3"))) (toml "https://github.com/ikatyang/tree-sitter-toml.git" ,(arkta/treesit-cond @@ -182,8 +166,7 @@ (tsx "https://github.com/tree-sitter/tree-sitter-typescript.git" ,(arkta/treesit-cond - (14 "v0.23.2") - (13 "v0.19.0")) + (14 "v0.23.2")) "tsx/src") (typescript "https://github.com/tree-sitter/tree-sitter-typescript.git" ,(arkta/treesit-cond @@ -195,10 +178,9 @@ ,(arkta/treesit-cond (13 "v0.5.0"))) - ,@(when (arkta/treesit-supports 14) - `((typst "https://github.com/uben0/tree-sitter-typst.git" - ,(arkta/treesit-cond - (14 "v0.11.0"))))))) + (typst "https://github.com/uben0/tree-sitter-typst.git" + ,(arkta/treesit-cond + (14 "v0.11.0"))))) (arkta/treesit-ensure-languages)) -- cgit v1.2.3