From ac7cea57e9080c9fdf46f9ff37a6598c74aea823 Mon Sep 17 00:00:00 2001
From: Misaka <chuxubank@qq.com>
Date: Wed, 22 May 2024 09:47:54 +0800
Subject: [PATCH] Add treesit-fold

---
 cats/+tree-sitter.el | 15 ---------------
 cats/+treesit.el     | 21 +++++++++++++++++++++
 config.el            |  2 +-
 3 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 cats/+treesit.el

diff --git a/cats/+tree-sitter.el b/cats/+tree-sitter.el
index cc679f8..6bf7c1c 100644
--- a/cats/+tree-sitter.el
+++ b/cats/+tree-sitter.el
@@ -1,9 +1,5 @@
 ;; -*- lexical-binding: t; -*-
 
-;; https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/notes/tree-sitter/starter-guide?h=feature/tree-sitter
-
-(setq treesit-font-lock-level 4)
-
 (use-package tree-sitter
   :delight " "
   :hook
@@ -41,14 +37,3 @@ more information."
   (push '(import_declaration
           . (lambda (node offset)
               (ts-fold-range-same node offset "import "))) (alist-get 'java-mode ts-fold-range-alist)))
-
-(use-package treesit-auto
-  :disabled
-  :when EMACS29+
-  :hook (after-init . global-treesit-auto-mode)
-  :custom
-  (treesit-auto-install 'prompt)
-  :config
-  (dolist (lang '(cmake cpp bash))
-    (setq treesit-auto-langs (delete lang treesit-auto-langs)))
-  (setq treesit-language-source-alist (treesit-auto--build-treesit-source-alist)))
diff --git a/cats/+treesit.el b/cats/+treesit.el
new file mode 100644
index 0000000..0cf1798
--- /dev/null
+++ b/cats/+treesit.el
@@ -0,0 +1,21 @@
+;; -*- lexical-binding: t; -*-
+
+;; https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/notes/tree-sitter/starter-guide?h=feature/tree-sitter
+
+(use-package treesit
+  :ensure nil
+  :custom
+  (treesit-font-lock-level 4))
+
+(use-package treesit-fold
+  :hook (after-init . global-treesit-fold-mode)
+  :pin jcs-elpa)
+
+(use-package treesit-auto
+  :hook (after-init . global-treesit-auto-mode)
+  :custom
+  (treesit-auto-install 'prompt)
+  :config
+  (dolist (lang '(cmake cpp bash))
+    (setq treesit-auto-langs (delete lang treesit-auto-langs)))
+  (setq treesit-language-source-alist (treesit-auto--build-treesit-source-alist)))
diff --git a/config.el b/config.el
index c14f388..22a758e 100644
--- a/config.el
+++ b/config.el
@@ -79,7 +79,7 @@
 ;;; code
 (cat! "+format")
 (cat! "+flycheck")
-(cat! "+tree-sitter")
+(if EMACS29+ (cat! "+treesit") (cat! "+tree-sitter"))
 (cat! "+doc")
 (cat! "+sideline")
 (cat! "+codeium")