1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00

Fix treesit-admin.el after recent treesit.el change

* admin/tree-sitter/treesit-admin.el:
(treesit-admin--verify-major-mode-queries):
(treesit-admin--validate-mode-lang):
(treesit-admin--mode-languages): Use
treesit-font-lock-setting-language.
This commit is contained in:
Yuan Fu 2025-10-23 21:44:12 -07:00
parent f47824106a
commit bb491ff804
No known key found for this signature in database
GPG key ID: 56E19BC57664A442

View file

@ -193,7 +193,7 @@ queries that has problems with latest grammar."
(all-queries-valid t)) (all-queries-valid t))
(dolist (setting settings) (dolist (setting settings)
(let* ((query (treesit-font-lock-setting-query setting)) (let* ((query (treesit-font-lock-setting-query setting))
(language (treesit-query-language query)) (language (treesit-font-lock-setting-language setting))
(feature (treesit-font-lock-setting-feature setting))) (feature (treesit-font-lock-setting-feature setting)))
;; Record that MODE uses LANGUAGE. ;; Record that MODE uses LANGUAGE.
(unless (memq language (alist-get mode mode-language-alist)) (unless (memq language (alist-get mode mode-language-alist))
@ -299,7 +299,7 @@ Return non-nil if all queries are valid, nil otherwise."
(dolist (setting settings) (dolist (setting settings)
;; `treesit-font-lock-setting-query' isn't available in Emacs 30. ;; `treesit-font-lock-setting-query' isn't available in Emacs 30.
(let* ((query (car setting)) (let* ((query (car setting))
(language (treesit-query-language query))) (language (treesit-font-lock-setting-language setting)))
;; Validate query. ;; Validate query.
(when (and (eq lang language) (when (and (eq lang language)
(not (treesit-query-valid-p language query))) (not (treesit-query-valid-p language query)))
@ -322,9 +322,7 @@ Return non-nil if all queries are valid, nil otherwise."
treesit-font-lock-settings))) treesit-font-lock-settings)))
(all-queries-valid t)) (all-queries-valid t))
(cl-remove-duplicates (cl-remove-duplicates
(mapcar #'treesit-query-language (mapcar #'treesit-font-lock-setting-language settings))))
(mapcar #'treesit-font-lock-setting-query
settings)))))
(defun treesit-admin--find-latest-compatible-revision (defun treesit-admin--find-latest-compatible-revision
(mode language source-alist grammar-dir revision-type (mode language source-alist grammar-dir revision-type