refactor: tree-sitter.

seagle0128 · Oct 18, 2023 · 7a7831d · 7a7831d
1 parent 2c3193d
commit 7a7831d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/lisp/init-c.el b/lisp/init-c.el
@@ -40,7 +40,7 @@
          ("<f12>" . compile))
   :init (setq-default c-basic-offset 4))
 
-(when (and centaur-tree-sitter (centaur-treesit-available-p))
+(when (centaur-treesit-available-p)
   (use-package c-ts-mode
     :init (setq c-ts-mode-indent-offset 4)))
 

diff --git a/lisp/init-funcs.el b/lisp/init-funcs.el
@@ -237,7 +237,8 @@ Same as '`replace-string' `C-q' `C-m' `RET' `RET''."
 (defun centaur-treesit-available-p ()
   "Check whether tree-sitter is available.
 Native tree-sitter is introduced since 29."
-  (and (fboundp 'treesit-available-p)
+  (and centaur-tree-sitter
+       (fboundp 'treesit-available-p)
        (treesit-available-p)))
 
 (defun centaur-set-variable (variable value &optional no-save)

diff --git a/lisp/init-go.el b/lisp/init-go.el
@@ -103,7 +103,7 @@
            ("C-c t c" . go-test-current-coverage)
            ("C-c t x" . go-run))))
 
-(when (and centaur-tree-sitter (centaur-treesit-available-p))
+(when (centaur-treesit-available-p)
   (use-package go-ts-mode
     :init (setq go-ts-mode-indent-offset 4)))
 

diff --git a/lisp/init-prog.el b/lisp/init-prog.el
@@ -44,7 +44,7 @@
   (setq prettify-symbols-unprettify-at-point 'right-edge))
 
 ;; Tree-sitter support
-(when (and centaur-tree-sitter (centaur-treesit-available-p))
+(when (centaur-treesit-available-p)
   (use-package treesit-auto
     :hook (after-init . global-treesit-auto-mode)
     :init (setq treesit-auto-install 'prompt)))