bug#70478: 30.0.50; [PATCH] Fix treesitter-font-lock-settings for built-in functions and attributes.

[Prateek Sharma <ps.prateek.sharma143@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1207 bytes --]

Yuan, do you mean like this in the attached file?

On Mon, Apr 22, 2024 at 5:09 AM Yuan Fu <casouri@gmail.com> wrote:

>
>
> > On Apr 20, 2024, at 10:27 PM, Eli Zaretskii <eliz@gnu.org> wrote:
> >
> >> From: Yuan Fu <casouri@gmail.com>
> >> Date: Sat, 20 Apr 2024 20:47:29 -0700
> >> Cc: Eli Zaretskii <eliz@gnu.org>,
> >> 70478@debbugs.gnu.org
> >>
> >>> On Sat, Apr 20, 2024 at 1:11 PM Eli Zaretskii <eliz@gnu.org> wrote:
> >>>> From: Prateek Sharma <ps.prateek.sharma143@gmail.com>
> >>>> Date: Sat, 20 Apr 2024 12:25:24 +0530
> >>>> Cc: Yuan Fu <casouri@gmail.com>, 70478@debbugs.gnu.org
> >>>>
> >>>> Also should I squash the changes of both the above commits into one
> and then create a patch file?
> >>>
> >>> You should squash, yes.  Other than that, attaching the patches as you
> >>> did is fine.
> >>>
> >>> Thanks.
> >>> <0001-Fix-treesitter-font-lock-settings-for-built-in-funct.patch>
> >>
> >> Thanks! Should I apply this to master or emacs-29? It’s a fix so I
> think emacs-29?
> >
> > Yes, emacs-29 is fine.
>
> Merged. BTW, Prateek, make sure to wrap the title and body of the commit
> message, and not end the title with a period. 😊
>
> Yuan

[-- Attachment #1.2: Type: text/html, Size: 2200 bytes --]

[-- Attachment #2: 0001-Fix-treesitter-font-lock-settings-for-built-in-funct.patch --]
[-- Type: application/octet-stream, Size: 1670 bytes --]

From 6b8e155a6fc917eb644a32c06fa7383a8cbf47b9 Mon Sep 17 00:00:00 2001
From: Prateek Sharma <ps.prateek.sharma143@gmail.com>
Date: Sat, 20 Apr 2024 02:06:17 +0530
Subject: [PATCH] Fix treesitter-font-lock-settings for built-in
 functions and attributes

* lisp/progmodes/python.el (python--treesit-settings): Change the
  treesitter query to fetch the correct type of node for built-in
  functions and attributes and highlight them with corresponding
  font-lock face.
---
 lisp/progmodes/python.el | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 85279d3e84b..d6c29e5ffc6 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1206,13 +1206,15 @@ fontified."
 
    :feature 'builtin
    :language 'python
-   `(((identifier) @font-lock-builtin-face
-      (:match ,(rx-to-string
-                `(seq bol
-                      (or ,@python--treesit-builtins
-                          ,@python--treesit-special-attributes)
-                      eol))
-              @font-lock-builtin-face)))
+   `((call function: (identifier) @font-lock-builtin-face
+           (:match ,(rx-to-string
+                     `(seq bol (or ,@python--treesit-builtins) eol))
+                   @font-lock-builtin-face))
+     (attribute attribute: (identifier) @font-lock-builtin-face
+                (:match ,(rx-to-string
+                          `(seq bol
+                                (or ,@python--treesit-special-attributes) eol))
+                        @font-lock-builtin-face)))
 
    :feature 'decorator
    :language 'python
-- 
2.39.3 (Apple Git-146)