From: Vincenzo Pupillo <v.pupillo@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 71518@debbugs.gnu.org, casouri@gmail.com
Subject: bug#71518: 30.0.50; Errors during redisplay with c++-ts-mode
Date: Sat, 22 Jun 2024 19:59:42 +0200 [thread overview]
Message-ID: <2832324.DJkKcVGEfx@fedora> (raw)
In-Reply-To: <86zfrcgb9s.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1318 bytes --]
In data sabato 22 giugno 2024 19:03:43 CEST, Eli Zaretskii ha scritto:
> > Cc: 71518@debbugs.gnu.org, casouri@gmail.com
> > Date: Sat, 22 Jun 2024 19:56:34 +0300
> > From: Eli Zaretskii <eliz@gnu.org>
> >
> > Hmm... I still see an error message in *Messages* after installing
> >
> > this (I have grammar library version 0.22.2):
> > Error during redisplay: (jit-lock-function 1) signaled
> > (treesit-query-error "Node type error at" 2 "(virtual)
> > @font-lock-keyword-face [\"auto\" \"_Atomic\" \"break\" \"case\"
> > \"const\" \"continue\" \"default\" \"do\" \"else\" \"enum\" \"extern\"
> > \"for\" \"goto\" \"if\" \"inline\" \"register\" \"restrict\" \"return\"
> > \"sizeof\" \"static\" \"struct\" \"switch\" \"typedef\" \"union\"
> > \"volatile\" \"while\"] @font-lock-keyword-face" "Debug the query with
> > `treesit-query-validate'")>
> > Any ideas or suggestions? "virtual" is highlighted, though, so I
> > guess this is a matter of suppressing the errors or something?
>
> E.g., you can see in go-ts-mode.el how the code probes whether a
> certain query is supported, and uses it only if it is.
Sorry, I only tested with .cpp files.
The rule had to be protected by (when (eq mode 'cpp)...
Now I have tested this with *.c and *.h as well, with old and new grammar.
Thanks
Vincenzo
[-- Attachment #2: 0001-Fix-for-grammar-change-of-keyword-virtual-in-tree-si.patch --]
[-- Type: text/x-patch, Size: 1533 bytes --]
From f518a28117c0418dc11bc4d9312df6609272813b Mon Sep 17 00:00:00 2001
From: Vincenzo Pupillo <v.pupillo@gmail.com>
Date: Sat, 22 Jun 2024 16:22:16 +0200
Subject: [PATCH] Fix for grammar change of keyword "virtual" in
tree-sitter-cpp
The new rule works with both the new (>= 0.22.1) and the old (<= 0.22.0)
grammar.
* lisp/progmodes/c-ts-mode.el (c-ts-mode--keywords):
Removed the keyword "virtual".
* lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings):
New font lock rule. (Bug#71518)
---
lisp/progmodes/c-ts-mode.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index f453392ff7f..e7f74fc53f2 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -572,7 +572,7 @@ c-ts-mode--keywords
"not" "not_eq" "operator" "or"
"or_eq" "override" "private" "protected"
"public" "requires" "template" "throw"
- "try" "typename" "using" "virtual"
+ "try" "typename" "using"
"xor" "xor_eq"))
(append '("auto") c-keywords))))
@@ -635,7 +635,8 @@ c-ts-mode--font-lock-settings
`([,@(c-ts-mode--keywords mode)] @font-lock-keyword-face
,@(when (eq mode 'cpp)
'((auto) @font-lock-keyword-face
- (this) @font-lock-keyword-face)))
+ (this) @font-lock-keyword-face
+ (virtual) @font-lock-keyword-face)))
:language mode
:feature 'operator
--
2.45.2
next prev parent reply other threads:[~2024-06-22 17:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-12 12:33 bug#71518: 30.0.50; Errors during redisplay with c++-ts-mode Eli Zaretskii
2024-06-12 13:53 ` Vincenzo Pupillo
2024-06-13 6:51 ` Yuan Fu
2024-06-13 8:24 ` Eli Zaretskii
2024-06-13 8:57 ` Vincenzo Pupillo
2024-06-22 8:26 ` Eli Zaretskii
2024-06-22 14:42 ` Vincenzo Pupillo
2024-06-22 15:57 ` Eli Zaretskii
2024-06-22 16:14 ` Vincenzo Pupillo
2024-06-22 16:56 ` Eli Zaretskii
2024-06-22 17:03 ` Eli Zaretskii
2024-06-22 17:59 ` Vincenzo Pupillo [this message]
2024-06-22 18:15 ` Eli Zaretskii
2024-06-22 18:15 ` Vincenzo Pupillo
2024-06-22 18:19 ` Eli Zaretskii
2024-06-22 23:18 ` Yuan Fu
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2832324.DJkKcVGEfx@fedora \
--to=v.pupillo@gmail.com \
--cc=71518@debbugs.gnu.org \
--cc=casouri@gmail.com \
--cc=eliz@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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.