Re: [PATCH] treesit.el: New function to describe font-lock rules

[Yuan Fu <casouri@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 348 bytes --]

(Adding emacs-devel back to CC)

> On Oct 18, 2023, at 1:32 AM, Huan Nguyen <nguyenthieuhuan@gmail.com> wrote:
> 
> My copyright assignment process is done.

Great! I’ve pushed it to master. Eli, do we need a NEWS entry for this change? We are adding a new keyword for treesit-font-lock-rules. I attached the merged patch below.

Yuan


[-- Attachment #2: 0001-New-keyword-default-language-in-treesit-font-lock-ru.patch --]
[-- Type: application/octet-stream, Size: 3983 bytes --]

From 70c3bfdafa46a5389b25fab322ca2c2bb75f3583 Mon Sep 17 00:00:00 2001
From: Huan Nguyen <goafanxx@gmail.com>
Date: Sat, 7 Oct 2023 12:03:55 +0200
Subject: [PATCH] New keyword :default-language in `treesit-font-lock-rules'
 function.

* lisp/treesit.el (treesit-font-lock-rules):
Keyword :default-language `LANGUAGE' will be chosen for every :feature.
Using :language will override the :default-language for the next :feature.
---
 lisp/treesit.el | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 402417c..31ebd50 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -922,12 +922,21 @@ treesit-font-lock-rules
           ;; that following queries will apply to.
           current-language current-override
           current-feature
+          ;; default-language will be chosen when current-language is not set
+          default-language
           ;; The list this function returns.
           (result nil))
       (while query-specs
         (let ((token (pop query-specs)))
           (pcase token
             ;; (1) Process keywords.
+            (:default-language
+             (let ((lang (pop query-specs)))
+               (when (or (not (symbolp lang)) (null lang))
+                 (signal 'treesit-font-lock-error
+                         `("Value of :default-language should be a symbol"
+                           ,lang)))
+               (setq default-language lang)))
             (:language
              (let ((lang (pop query-specs)))
                (when (or (not (symbolp lang)) (null lang))
@@ -955,23 +964,24 @@ treesit-font-lock-rules
                (setq current-feature var)))
             ;; (2) Process query.
             ((pred treesit-query-p)
-             (when (null current-language)
-               (signal 'treesit-font-lock-error
-                       `("Language unspecified, use :language keyword to specify a language for this query" ,token)))
-             (when (null current-feature)
-               (signal 'treesit-font-lock-error
-                       `("Feature unspecified, use :feature keyword to specify the feature name for this query" ,token)))
-             (if (treesit-compiled-query-p token)
-                 (push `(,current-language token) result)
-               (push `(,(treesit-query-compile current-language token)
-                       t
-                       ,current-feature
-                       ,current-override)
-                     result))
-             ;; Clears any configurations set for this query.
-             (setq current-language nil
-                   current-override nil
-                   current-feature nil))
+             (let ((lang (or default-language current-language)))
+               (when (null lang)
+                 (signal 'treesit-font-lock-error
+                         `("Language unspecified, use :language keyword or :default-language to specify a language for this query" ,token)))
+               (when (null current-feature)
+                 (signal 'treesit-font-lock-error
+                         `("Feature unspecified, use :feature keyword to specify the feature name for this query" ,token)))
+               (if (treesit-compiled-query-p token)
+                   (push `(,lang token) result)
+                 (push `(,(treesit-query-compile lang token)
+                         t
+                         ,current-feature
+                         ,current-override)
+                       result))
+               ;; Clears any configurations set for this query.
+               (setq current-language nil
+                     current-override nil
+                     current-feature nil)))
             (_ (signal 'treesit-font-lock-error
                        `("Unexpected value" ,token))))))
       (nreverse result))))
-- 
2.41.0