unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Dmitry Gutov <dgutov@yandex.ru>
To: Alan Mackenzie <acm@muc.de>, emacs-devel@gnu.org
Subject: Re: c-ts-mode: (eq treesit-font-lock-level 2) doesn't fontify parameter names.
Date: Sat, 4 Feb 2023 19:32:11 +0200	[thread overview]
Message-ID: <85fc0396-bf75-c059-3871-80a5cae8ab94@yandex.ru> (raw)
In-Reply-To: <Y95wa0U+B7QO/9rz@ACM>

On 04/02/2023 16:49, Alan Mackenzie wrote:
> Setting treesit-font-lock-level to 2 for c-ts-mode fontifies variable
> definitions, but not parameter definitions.

The patch below seems to fix that (the functionality was basically 
implemented already). I suggest we install it on emacs-29, for 
consistency with other modes, among other things.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 390f67a8e8c..7300074e5c6 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -440,11 +440,10 @@ c-ts-mode--font-lock-settings
        declarator: (_) @c-ts-mode--fontify-declarator)

       (function_definition
-      declarator: (_) @c-ts-mode--fontify-declarator))
+      declarator: (_) @c-ts-mode--fontify-declarator)

-   ;; Should we highlight identifiers in the parameter list?
-   ;; (parameter_declaration
-   ;;  declarator: (_) @c-ts-mode--fontify-declarator))
+     (parameter_declaration
+      declarator: (_) @c-ts-mode--fontify-declarator))

     :language mode
     :feature 'assignment
@@ -552,9 +551,10 @@ c-ts-mode--fontify-declarator
                                                identifier)))
                   ("function_declarator" 'font-lock-function-name-face)
                   (_ 'font-lock-variable-name-face))))
-    (treesit-fontify-with-override
-     (treesit-node-start identifier) (treesit-node-end identifier)
-     face override start end)))
+    (when identifier
+      (treesit-fontify-with-override
+       (treesit-node-start identifier) (treesit-node-end identifier)
+       face override start end))))

  (defun c-ts-mode--fontify-variable (node override start end &rest _)
    "Fontify an identifier node if it is a variable.



  parent reply	other threads:[~2023-02-04 17:32 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-04 14:49 c-ts-mode: (eq treesit-font-lock-level 2) doesn't fontify parameter names Alan Mackenzie
2023-02-04 15:04 ` Eli Zaretskii
2023-02-04 16:36   ` Alan Mackenzie
2023-02-04 16:59     ` Eli Zaretskii
2023-02-04 17:32 ` Dmitry Gutov [this message]
2023-02-04 18:13   ` Eli Zaretskii
2023-02-04 18:16     ` Dmitry Gutov
2023-02-04 18:19     ` Eli Zaretskii
2023-02-04 18:44       ` Dmitry Gutov
2023-02-04 20:09   ` Alan Mackenzie
2023-02-04 20:19     ` Eli Zaretskii
2023-02-04 20:42       ` Alan Mackenzie
2023-02-05  5:33         ` Eli Zaretskii

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=85fc0396-bf75-c059-3871-80a5cae8ab94@yandex.ru \
    --to=dgutov@yandex.ru \
    --cc=acm@muc.de \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).