diff options
| author | Yuan Fu | 2025-10-23 21:44:12 -0700 |
|---|---|---|
| committer | Yuan Fu | 2025-10-23 21:46:14 -0700 |
| commit | bb491ff804205d814980757d3b49f0f36b1430bb (patch) | |
| tree | 9af3ef67537f0ae02bf7fb30e277309b47f281b9 /admin | |
| parent | f47824106a58f00c8d5e166930f18102b5e96bd0 (diff) | |
| download | emacs-bb491ff804205d814980757d3b49f0f36b1430bb.tar.gz emacs-bb491ff804205d814980757d3b49f0f36b1430bb.zip | |
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.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/tree-sitter/treesit-admin.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/admin/tree-sitter/treesit-admin.el b/admin/tree-sitter/treesit-admin.el index 1f1fa1ce752..a76e105e908 100644 --- a/admin/tree-sitter/treesit-admin.el +++ b/admin/tree-sitter/treesit-admin.el | |||
| @@ -193,7 +193,7 @@ queries that has problems with latest grammar." | |||
| 193 | (all-queries-valid t)) | 193 | (all-queries-valid t)) |
| 194 | (dolist (setting settings) | 194 | (dolist (setting settings) |
| 195 | (let* ((query (treesit-font-lock-setting-query setting)) | 195 | (let* ((query (treesit-font-lock-setting-query setting)) |
| 196 | (language (treesit-query-language query)) | 196 | (language (treesit-font-lock-setting-language setting)) |
| 197 | (feature (treesit-font-lock-setting-feature setting))) | 197 | (feature (treesit-font-lock-setting-feature setting))) |
| 198 | ;; Record that MODE uses LANGUAGE. | 198 | ;; Record that MODE uses LANGUAGE. |
| 199 | (unless (memq language (alist-get mode mode-language-alist)) | 199 | (unless (memq language (alist-get mode mode-language-alist)) |
| @@ -299,7 +299,7 @@ Return non-nil if all queries are valid, nil otherwise." | |||
| 299 | (dolist (setting settings) | 299 | (dolist (setting settings) |
| 300 | ;; `treesit-font-lock-setting-query' isn't available in Emacs 30. | 300 | ;; `treesit-font-lock-setting-query' isn't available in Emacs 30. |
| 301 | (let* ((query (car setting)) | 301 | (let* ((query (car setting)) |
| 302 | (language (treesit-query-language query))) | 302 | (language (treesit-font-lock-setting-language setting))) |
| 303 | ;; Validate query. | 303 | ;; Validate query. |
| 304 | (when (and (eq lang language) | 304 | (when (and (eq lang language) |
| 305 | (not (treesit-query-valid-p language query))) | 305 | (not (treesit-query-valid-p language query))) |
| @@ -322,9 +322,7 @@ Return non-nil if all queries are valid, nil otherwise." | |||
| 322 | treesit-font-lock-settings))) | 322 | treesit-font-lock-settings))) |
| 323 | (all-queries-valid t)) | 323 | (all-queries-valid t)) |
| 324 | (cl-remove-duplicates | 324 | (cl-remove-duplicates |
| 325 | (mapcar #'treesit-query-language | 325 | (mapcar #'treesit-font-lock-setting-language settings)))) |
| 326 | (mapcar #'treesit-font-lock-setting-query | ||
| 327 | settings))))) | ||
| 328 | 326 | ||
| 329 | (defun treesit-admin--find-latest-compatible-revision | 327 | (defun treesit-admin--find-latest-compatible-revision |
| 330 | (mode language source-alist grammar-dir revision-type | 328 | (mode language source-alist grammar-dir revision-type |