jimeh/.emacs.d
1
0
Fork 0
mirror of https://github.com/jimeh/.emacs.d.git synced 2026-02-19 13:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(text-editing/treesit): resolve issues with treesit-auto package

Browse Source 
When the global-treesit-auto-mode is enabled, was getting lots of errors
related to an infinite loop whenever opening a buffer supported by one
of `*-ts-mode` modes. Instead, I now take a more manual and intentional
approach to using the built-in treesit modes for specific languages.
This commit is contained in:
Jim Myhrberg
2023-12-15 14:55:22 +00:00
parent 9f66a08279
commit df10665d0c
4 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
modules/text-editing/siren-treesit.el
View File

@@ -13,21 +13,43 @@
(when (fboundp 'treesit-ready-p)
(setopt treesit-font-lock-level 4)
(defun siren-treesit-prepare (mode source)
(defun siren-treesit-manual-prepare (mode source)
"Setup treesit for MODE with SOURCE."
(add-to-list 'treesit-language-source-alist source)
(let ((lang (car source)))
(advice-add mode :before `(lambda (&rest _)
(when (not (treesit-ready-p ',lang))
(treesit-install-language-grammar ',lang))))))
(advice-add mode :before
`(lambda (&rest _)
(when (not (treesit-ready-p ',lang t))
(treesit-install-language-grammar ',lang))))))
(use-package treesit-auto
:demand t
:if (fboundp 'treesit-ready-p)
:custom
(treesit-auto-install nil)
:preface
(defun siren-treesit-auto-ensure-grammar (grammar)
"Ensure that treesit GRAMMAR is installed and ready for use."
(when (and (fboundp 'treesit-ready-p)
(not (treesit-ready-p grammar t)))
(let ((treesit-language-source-alist
(treesit-auto--build-treesit-source-alist)))
(treesit-install-language-grammar grammar))))
(defvar siren-treesit-auto--source-alist-populated-p 'nil
"Internal flag to track if `treesit-auto--build-treesit-source-alist'
has been used to populate `treesit-language-source-alist'.")
(defun siren-treesit-auto--populate-treesit-language-source-alist ()
(if (not siren-treesit-auto--source-alist-populated-p)
(setq treesit-language-source-alist
(append treesit-language-source-alist
(treesit-auto--build-treesit-source-alist))
siren-treesit-auto--source-alist-populated-p t)))
:config
(global-treesit-auto-mode)))
(siren-treesit-auto--populate-treesit-language-source-alist)))
(provide 'siren-treesit)
;;; siren-treesit.el ends here