From: Noah Peart <noah.v.peart@gmail.com>
To: 70464@debbugs.gnu.org
Subject: bug#70464: [PATCH] Add font-locking for Rust macro variables
Date: Thu, 18 Apr 2024 18:42:36 -0700 [thread overview]
Message-ID: <CAPVBTSeieWU87m8a=47skgV5x=GpYwUmDkf0MmkftX3u_NF92g@mail.gmail.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 1668 bytes --]
Tags: patch
Adds some tree-sitter font-locking rules in rust-ts-mode to fontify
meta variables, their types, and repetition operators in macros.
These rules add new font-locking as indicated in the following
snippet:
macro_rules! unsafe_raw_call {
($env:expr, $name:ident $(, $args:expr)*) => {
// ^ font-lock-variable-name-face
// ^ font-lock-type-face
// ^ font-lock-operator-face
// ^
font-lock-operator-face
{
let env = $env;
// ^ font-lock-variable-use-face
let result = unsafe {
let $name = raw_fn!(env, $name);
$name(env.raw $(, $args)*)
};
env.handle_exit(result)
}
};
}
I also removed the last occurrence of the following duplicated rule from
the `type` feature:
(type_identifier) @font-lock-type-face
In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version
3.24.33, cairo version 1.16.0) of 2024-04-18 built on noah-X580VD
Repository revision: 0a57dfcff8d0abcf4427cfbfd886264bb3b8eaab
Repository branch: master
Windowing system distributor 'The X.Org Foundation', version 11.0.12101004
System Description: Ubuntu 22.04.4 LTS
Configured using:
'configure --prefix=/usr/local --with-modules --with-tree-sitter
--with-threads --with-x-toolkit=gtk3 --with-xwidgets --with-gnutls
--with-json --with-mailutils --with-jpeg --with-png --with-rsvg
--with-tiff --with-xml2 --with-xpm --with-imagemagick CC=gcc-12
CXX=gcc-12'
[-- Attachment #1.2: Type: text/html, Size: 2078 bytes --]
[-- Attachment #2: 0001-Add-font-locking-for-Rust-macros.patch --]
[-- Type: text/x-patch, Size: 3148 bytes --]
From b7eb9b37eb9cfd6a94a862f5944b00c113ee7efb Mon Sep 17 00:00:00 2001
From: Noah Peart <noah.v.peart@gmail.com>
Date: Thu, 18 Apr 2024 18:22:05 -0700
Subject: [PATCH] Add font-locking for Rust macros
* lisp/progmodes/rust-ts-mode.el
(rust-ts-mode--font-lock-settings): Add font-locking for Rust
macro metavariables, fragment specifiers and repitition patterns.
---
lisp/progmodes/rust-ts-mode.el | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/lisp/progmodes/rust-ts-mode.el b/lisp/progmodes/rust-ts-mode.el
index 7112ceced57..69538568d1c 100644
--- a/lisp/progmodes/rust-ts-mode.el
+++ b/lisp/progmodes/rust-ts-mode.el
@@ -178,6 +178,8 @@ rust-ts-mode--font-lock-settings
'((function_item name: (identifier) @font-lock-function-name-face)
(macro_definition "macro_rules!" @font-lock-constant-face)
(macro_definition (identifier) @font-lock-preprocessor-face)
+ (token_binding_pattern
+ name: (metavariable) @font-lock-variable-name-face)
(field_declaration name: (field_identifier) @font-lock-property-name-face)
(parameter pattern: (_) @rust-ts-mode--fontify-pattern)
(closure_parameters (_) @rust-ts-mode--fontify-pattern)
@@ -218,7 +220,9 @@ rust-ts-mode--font-lock-settings
:language 'rust
:feature 'operator
- `([,@rust-ts-mode--operators] @font-lock-operator-face)
+ `([,@rust-ts-mode--operators] @font-lock-operator-face
+ (token_repetition_pattern ["$" "*" "+"] @font-lock-operator-face)
+ (token_repetition ["$" "*" "+"] @font-lock-operator-face))
:language 'rust
:feature 'string
@@ -248,8 +252,7 @@ rust-ts-mode--font-lock-settings
(_ type: (scoped_identifier
path: (identifier) @font-lock-type-face))))
(mod_item name: (identifier) @font-lock-constant-face)
- (primitive_type) @font-lock-type-face
- (type_identifier) @font-lock-type-face
+ [(fragment_specifier) (primitive_type) (type_identifier)] @font-lock-type-face
((scoped_identifier name: (identifier) @rust-ts-mode--fontify-tail))
((scoped_identifier path: (identifier) @font-lock-type-face)
(:match ,(rx bos
@@ -259,8 +262,7 @@ rust-ts-mode--font-lock-settings
eos)
@font-lock-type-face))
((scoped_identifier path: (identifier) @rust-ts-mode--fontify-scope))
- ((scoped_type_identifier path: (identifier) @rust-ts-mode--fontify-scope))
- (type_identifier) @font-lock-type-face)
+ ((scoped_type_identifier path: (identifier) @rust-ts-mode--fontify-scope)))
:language 'rust
:feature 'property
@@ -294,7 +296,8 @@ rust-ts-mode--font-lock-settings
(return_expression (identifier) @font-lock-variable-use-face)
(tuple_expression (identifier) @font-lock-variable-use-face)
(unary_expression (identifier) @font-lock-variable-use-face)
- (while_expression condition: (identifier) @font-lock-variable-use-face))
+ (while_expression condition: (identifier) @font-lock-variable-use-face)
+ (metavariable) @font-lock-variable-use-face)
:language 'rust
:feature 'escape-sequence
--
2.34.1
next reply other threads:[~2024-04-19 1:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-19 1:42 Noah Peart [this message]
2024-04-19 7:41 ` bug#70464: [PATCH] Add font-locking for Rust macro variables Yuan Fu
2024-04-19 8:02 ` Vladimir Kazanov
2024-04-19 16:44 ` Noah Peart
2024-04-19 17:38 ` Noah Peart
2024-04-22 5:00 ` 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='CAPVBTSeieWU87m8a=47skgV5x=GpYwUmDkf0MmkftX3u_NF92g@mail.gmail.com' \
--to=noah.v.peart@gmail.com \
--cc=70464@debbugs.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.