diff options
| author | Juri Linkov | 2025-04-22 21:01:28 +0300 |
|---|---|---|
| committer | Juri Linkov | 2025-04-22 21:01:28 +0300 |
| commit | add8bf000aee39e40feacff7e0df7248fa4ef9c5 (patch) | |
| tree | 5e5feff0a8eb34eb06a02b4902dfbb852071f001 /admin | |
| parent | 573a2c09b991df5442ab3b9984c2885011153333 (diff) | |
| download | emacs-add8bf000aee39e40feacff7e0df7248fa4ef9c5.tar.gz emacs-add8bf000aee39e40feacff7e0df7248fa4ef9c5.zip | |
Replace some 'treesit-query-compile' with 'treesit-query-valid-p'.
* admin/tree-sitter/treesit-admin.el
(treesit-admin--verify-major-mode-queries)
(treesit-admin--validate-mode-lang):
* lisp/progmodes/csharp-mode.el
(csharp-ts-mode--test-this-expression)
(csharp-ts-mode--test-interpolated-string-text)
(csharp-ts-mode--test-string-content)
(csharp-ts-mode--test-type-constraint)
(csharp-ts-mode--test-type-of-expression)
(csharp-ts-mode--test-typeof-expression)
(csharp-ts-mode--test-name-equals)
(csharp-ts-mode--test-if-directive)
(csharp-ts-mode--test-method-declaration-type-field):
* lisp/progmodes/php-ts-mode.el
(php-ts-mode--test-namespace-name-as-prefix-p)
(php-ts-mode--test-namespace-aliasing-clause-p)
(php-ts-mode--test-namespace-use-group-clause-p)
(php-ts-mode--test-visibility-modifier-operation-clause-p)
(php-ts-mode--test-property-hook-clause-p):
* lisp/progmodes/typescript-ts-mode.el
(tsx-ts-mode--font-lock-compatibility-bb1f97b):
Use the newer equivalent 'treesit-query-valid-p'
instead of 'treesit-query-compile' with 'ignore-errors'.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/tree-sitter/treesit-admin.el | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/admin/tree-sitter/treesit-admin.el b/admin/tree-sitter/treesit-admin.el index ef6d256a538..f41c4592039 100644 --- a/admin/tree-sitter/treesit-admin.el +++ b/admin/tree-sitter/treesit-admin.el | |||
| @@ -156,9 +156,7 @@ queries that has problems with latest grammar." | |||
| 156 | (unless (memq language (alist-get mode mode-language-alist)) | 156 | (unless (memq language (alist-get mode mode-language-alist)) |
| 157 | (push language (alist-get mode mode-language-alist))) | 157 | (push language (alist-get mode mode-language-alist))) |
| 158 | ;; Validate query. | 158 | ;; Validate query. |
| 159 | (when (not (ignore-errors | 159 | (unless (treesit-query-valid-p language query) |
| 160 | (treesit-query-compile language query t) | ||
| 161 | t)) | ||
| 162 | (push (list mode language feature) invalid-feature-list) | 160 | (push (list mode language feature) invalid-feature-list) |
| 163 | (setq all-queries-valid nil)))) | 161 | (setq all-queries-valid nil)))) |
| 164 | (when all-queries-valid | 162 | (when all-queries-valid |
| @@ -261,9 +259,7 @@ Return non-nil if all queries are valid, nil otherwise." | |||
| 261 | (language (treesit-query-language query))) | 259 | (language (treesit-query-language query))) |
| 262 | ;; Validate query. | 260 | ;; Validate query. |
| 263 | (when (and (eq lang language) | 261 | (when (and (eq lang language) |
| 264 | (not (ignore-errors | 262 | (not (treesit-query-valid-p language query))) |
| 265 | (treesit-query-compile language query t) | ||
| 266 | t))) | ||
| 267 | (setq all-queries-valid nil)))) | 263 | (setq all-queries-valid nil)))) |
| 268 | all-queries-valid)) | 264 | all-queries-valid)) |
| 269 | 265 | ||