mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-11 01:11:31 -07:00
Code Issues Projects Releases Wiki Activity

(define-treesit-generic-mode): Improve autoloading support (bug#80480)

Browse source 
* lisp/treesit-x.el (define-treesit-generic-mode): Mark it as
`(autoload-macro expand)`.
Don't autoload the `treesit-language-source-alist` setting.
Generate simpler code for the common case where AUTO-MODE is a string.
This commit is contained in:
Stefan Monnier 2026-02-25 11:25:29 -05:00
parent 6d7f0acf9c
commit 2ce65ed06f
1 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lisp/treesit-x.el
View file

@ -86,6 +86,7 @@ of `define-treesit-generic-mode'.
(declare (debug (&define name [&optional stringp]
[&rest keywordp sexp] def-body))
(doc-string 2)
(autoload-macro expand)
(indent defun))
(when (and docstring (not (stringp docstring)))
@ -111,19 +112,19 @@ of `define-treesit-generic-mode'.
(when (stringp source)
(setq source (list 'quote (list source :copy-queries t))))
(when (stringp auto-mode)
(setq auto-mode (list 'quote (ensure-list auto-mode))))
`(progn
;; Add lang and source to source-alist.
(add-to-list 'treesit-language-source-alist (cons ,lang ,source) t)
;; Add it to auto-mode-alist
(dolist (re ,auto-mode)
(add-to-list 'auto-mode-alist (cons re ',mode)))
,(if (stringp auto-mode)
`(add-to-list 'auto-mode-alist '(,auto-mode . ,mode))
`(dolist (re ,auto-mode)
(add-to-list 'auto-mode-alist (cons re #',mode))))
(define-derived-mode ,mode
,(or (if (eq (car-safe parent) 'quote) (cadr parent) parent)
;; FIXME: This has to be a function name, it can't be an expression,
;; so the `quote' handling is misleading.
,(or (if (memq (car-safe parent) '(function quote))
(cadr parent) parent)
'fundamental-mode)
,(or name pretty-name)
,(or docstring
@ -131,7 +132,12 @@ of `define-treesit-generic-mode'.
"This a tree-sitter mode defined with `define-treesit-generic-mode'."))
(treesit-generic-mode-setup ,lang)
,@body
(treesit-major-mode-setup)))))
(treesit-major-mode-setup))
:autoload-end
;; Add lang and source to source-alist.
(add-to-list 'treesit-language-source-alist (cons ,lang ,source) t))))
;;;###autoload
(defun treesit-generic-mode-setup (lang)
@ -226,7 +232,7 @@ of `define-treesit-generic-mode'.
:copy-queries t)
:auto-mode "\\.liquid\\'"
:name "Liquid"
:parent 'mhtml-ts-mode
:parent #'mhtml-ts-mode
(setq-local treesit-range-settings
(append treesit-range-settings