From: Randy Taylor <dev@rjt.dev>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: eliz@gnu.org, "Jostein Kjønigsen" <jostein@kjonigsen.net>,
61302@debbugs.gnu.org
Subject: bug#61302: 29.0.60; rust-ts-mode does not show function-invocation on field-properties
Date: Thu, 09 Feb 2023 03:38:59 +0000 [thread overview]
Message-ID: <j65VssfyQ-COJXnaihwLt4wKO0n6Rr2DKwVfuZtLotv0thhVtaW3RJBTZXtLRs7QPegwr_qylVhSMYP_YdfXpdKHL3CBrXkJBvSbJovOJBA=@rjt.dev> (raw)
In-Reply-To: <05ee38a5-f783-5b2c-add6-ee2ea27ba297@yandex.ru>
[-- Attachment #1: Type: text/plain, Size: 3648 bytes --]
On Wednesday, February 8th, 2023 at 10:44, Dmitry Gutov <dgutov@yandex.ru> wrote:
>On 08/02/2023 05:38, Randy Taylor wrote:
>> I think the following rule from the type feature:
>> (scoped_type_identifier path: (identifier) @font-lock-type-face)
>>
>> Should be changed to font-lock-constant-face and moved to the module feature.
>>
>> That way, things like the following will be highlighted correctly:
>> let date = DateTime::<chrono::Utc>::from_utc(date, chrono::Utc);
>> ^^^^^^ this guy
>>
>> Unless I'm missing something.
>
>Should Utc in the above example be highlighted with
>font-lock-constant-face too?
No. It's a type.
>
>What if it looked like this:
>
> let date = DateTime::<chrono::utc>::from_utc(date, chrono::utc);
>
>If we decide purely based on capitalization, then I guess the rule
>should be present in both lists (with capitalized? regexp in one, and
>!capitalized? regexp in another), and a few more rules should be
>duplicated as well.
In both cases, utc is still a type even if it's not capitalized.
My patch addresses this.
>
>This becomes a little more painful semantically, given that the first
>'utc' in the example above is parsed into a (type_identifier) node, not
>just (identifier).
>
>>> On a distantly related note, we have terms like 'usize' which is
>>> normally a type (and highlighted as such), but can also feature in
>>> expressions like
>>>
>>> let row = usize::from_str_radix(row, 10).map_err(|_| error())?;
>>>
>>> where it is now highlighted with font-lock-constant-face. Should we try
>>> to do anything about that? If there is a limited number of built-in
>>> types in that situation (e.g. all of them primitives), we could handle
>>> that with a regexp.
>>
>> Right. I think it makes sense to handle the primitives with a regex.
>> I'm not sure if there's anything else beyond those.
>> There's a list of them here: https://doc.rust-lang.org/reference/types.html
>> I think it would only apply to the numerical and textual types.
>
>So 'usize' in the above is definitely a "type", not a "module"?
I think so. You can see on usize's documentation page (https://doc.rust-lang.org/std/primitive.usize.html)
that it provides that function, amongst many others.
>
>>> Or vice versa, in
>>>
>>> use std::{fmt, fs, usize};
>>>
>>> should 'fmt', 'fs' and 'usize' be highlighted with
>>> font-lock-constant-face rather than font-lock-type-face?
>>
>> They should indeed be highlighted with font-lock-constant-face because they are modules.
>> We assume the types will be capitalized since that's all we can really do (and it's the convention anyway).
>
>If they're modules here, I suppose they should be highlighted the same in
>
> let row = usize::from_str_radix(...)
>
>as well. The bright side is that will make a more complex regexp
>(enumerating the lowercase named types) unnecessary.
Yes, except for the primitives.
I have attached a patch which I think addresses most of the concerns (although I've been at it for a few hours and my brain is mush now).
The patch does the following:
- Separates import-related stuff and module use by leveraging the use_declaration query (simplifying things greatly IMO).
- Highlights primitive types used in scoped_identifiers.
- Properly highlights types belonging to a module no matter how deep it is (or your money back guaranteed!).
- Maybe some other stuff I forgot. I'm too tried now :).
A few questions:
- Should module be moved to level 3 to be with type?
- Do we still want the module feature, or should this stuff be put into type?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-rust-ts-mode-type-and-module-highlighting.patch --]
[-- Type: text/x-patch; name=0001-Fix-rust-ts-mode-type-and-module-highlighting.patch, Size: 4522 bytes --]
From 62ca2499a8d645c78e9ae8b4e233577b7ec5b0ae Mon Sep 17 00:00:00 2001
From: Randy Taylor <dev@rjt.dev>
Date: Wed, 8 Feb 2023 21:43:04 -0500
Subject: [PATCH] Fix rust-ts-mode type and module highlighting
* lisp/progmodes/rust-ts-mode.el (rust-ts-mode--font-lock-settings):
Add new 'module' feature and simplify 'type' feature.
(rust-ts-mode): Add 'module' feature.
---
lisp/progmodes/rust-ts-mode.el | 66 +++++++++++++++++++++++++---------
1 file changed, 50 insertions(+), 16 deletions(-)
diff --git a/lisp/progmodes/rust-ts-mode.el b/lisp/progmodes/rust-ts-mode.el
index 5c71a8ad461..6ab786c6c80 100644
--- a/lisp/progmodes/rust-ts-mode.el
+++ b/lisp/progmodes/rust-ts-mode.el
@@ -204,6 +204,41 @@ rust-ts-mode--font-lock-settings
(raw_string_literal)
(string_literal)] @font-lock-string-face)
+ :language 'rust
+ :feature 'module
+ `((scoped_identifier path: (crate)
+ name: (identifier) @font-lock-constant-face)
+
+ (scoped_use_list path: (identifier) @font-lock-constant-face)
+ (scoped_use_list path: (scoped_identifier
+ name: (identifier) @font-lock-constant-face))
+
+ ((use_declaration
+ argument: (scoped_identifier
+ path: (_) @font-lock-constant-face
+ name: (identifier) @font-lock-type-face))
+ (:match "^[A-Z]" @font-lock-type-face))
+ (use_declaration
+ argument: (scoped_identifier
+ name: (identifier) @font-lock-constant-face))
+
+ (use_declaration
+ argument: (scoped_identifier
+ path: (scoped_identifier
+ path: (_) @font-lock-constant-face
+ name: (identifier) @font-lock-constant-face)
+ name: (identifier) @font-lock-constant-face))
+
+ (use_declaration
+ argument: (scoped_use_list
+ path: (scoped_identifier
+ path: (_) @font-lock-constant-face
+ name: (identifier) @font-lock-constant-face)))
+
+ ((use_list (identifier) @font-lock-type-face)
+ (:match "^[A-Z]" @font-lock-type-face))
+ (use_list (identifier) @font-lock-constant-face))
+
:language 'rust
:feature 'type
`((enum_variant name: (identifier) @font-lock-type-face)
@@ -216,23 +251,21 @@ rust-ts-mode--font-lock-settings
(mod_item name: (identifier) @font-lock-constant-face)
(primitive_type) @font-lock-type-face
(type_identifier) @font-lock-type-face
- ((scoped_identifier name: (identifier) @font-lock-type-face)
- (:match "^[A-Z]" @font-lock-type-face))
((scoped_identifier path: (identifier) @font-lock-type-face)
- (:match "^[A-Z]" @font-lock-type-face))
- ((scoped_identifier
- (scoped_identifier
- path: (identifier) @font-lock-type-face))
- (:match "^[A-Z]" @font-lock-type-face))
- ((scoped_identifier
- path: [(identifier) @font-lock-type-face
- (scoped_identifier
- name: (identifier) @font-lock-type-face)])
- (:match "^[A-Z]" @font-lock-type-face))
- (scoped_type_identifier path: (identifier) @font-lock-type-face)
+ (:match
+ "^\\(u8\\|u16\\|u32\\|u64\\|u128\\|usize\\|i8\\|i16\\|i32\\|i64\\|i128\\|isize\\|char\\|str\\)$"
+ @font-lock-type-face))
+ (scoped_identifier path: (_) @font-lock-constant-face
+ name: (identifier) @font-lock-type-face)
+ (scoped_identifier path: (scoped_identifier
+ name: (identifier) @font-lock-constant-face))
+ (scoped_type_identifier path: (_) @font-lock-constant-face)
+ (scoped_type_identifier
+ path: (scoped_identifier
+ path: (_) @font-lock-constant-face
+ name: (identifier) @font-lock-constant-face))
(type_identifier) @font-lock-type-face
- (use_as_clause alias: (identifier) @font-lock-type-face)
- (use_list (identifier) @font-lock-type-face))
+ (use_as_clause alias: (identifier) @font-lock-type-face))
:language 'rust
:feature 'property
@@ -344,7 +377,8 @@ rust-ts-mode
( keyword string)
( attribute builtin constant escape-sequence
number type)
- ( bracket delimiter error function operator property variable)))
+ ( bracket delimiter error function module
+ operator property variable)))
;; Imenu.
(setq-local treesit-simple-imenu-settings
--
2.39.1
next prev parent reply other threads:[~2023-02-09 3:38 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-05 20:15 bug#61302: 29.0.60; rust-ts-mode does not show function-invocation on field-properties Jostein Kjønigsen
2023-02-05 21:30 ` Randy Taylor
2023-02-05 21:52 ` Jostein Kjønigsen
2023-02-05 21:59 ` Jostein Kjønigsen
2023-02-06 1:50 ` Randy Taylor
2023-02-06 2:45 ` Dmitry Gutov
2023-02-06 2:57 ` Randy Taylor
2023-02-07 14:26 ` Randy Taylor
2023-02-07 18:16 ` Dmitry Gutov
2023-02-07 18:25 ` Dmitry Gutov
2023-02-08 3:38 ` Randy Taylor
2023-02-08 15:44 ` Dmitry Gutov
2023-02-09 3:38 ` Randy Taylor [this message]
2023-02-09 21:19 ` Dmitry Gutov
2023-02-10 3:44 ` Randy Taylor
[not found] ` <33cec9a6-7e69-2eb3-a8a6-58ce23a5c185@yandex.ru>
2023-02-12 2:48 ` Randy Taylor
2023-02-13 3:37 ` Dmitry Gutov
2023-02-14 3:25 ` Randy Taylor
2023-02-14 11:42 ` Jostein Kjønigsen
2023-02-14 12:39 ` Randy Taylor
2023-02-14 14:28 ` Jostein Kjønigsen
2023-02-14 22:14 ` Dmitry Gutov
2023-02-15 2:07 ` Randy Taylor
2023-02-16 1:53 ` Dmitry Gutov
2023-02-18 3:27 ` Dmitry Gutov
2023-02-18 20:42 ` Randy Taylor
2023-02-18 21:45 ` Dmitry Gutov
2023-02-18 23:31 ` Randy Taylor
2023-02-19 0:13 ` Dmitry Gutov
2023-02-19 0:50 ` Randy Taylor
2023-02-19 17:23 ` Dmitry Gutov
2023-02-18 20:59 ` Dmitry Gutov
2023-02-13 10:17 ` Jostein Kjønigsen
2023-02-13 14:39 ` Randy Taylor
2023-02-13 15:04 ` Jostein Kjønigsen
2023-02-13 18:19 ` Randy Taylor
2023-02-13 19:57 ` Dmitry Gutov
2023-02-13 20:49 ` Dmitry Gutov
2023-02-13 19:59 ` Dmitry Gutov
2023-02-05 21:56 ` Dmitry Gutov
2023-02-06 2:06 ` Randy Taylor
2023-02-06 2:16 ` Dmitry Gutov
2023-02-05 21:44 ` Dmitry Gutov
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='j65VssfyQ-COJXnaihwLt4wKO0n6Rr2DKwVfuZtLotv0thhVtaW3RJBTZXtLRs7QPegwr_qylVhSMYP_YdfXpdKHL3CBrXkJBvSbJovOJBA=@rjt.dev' \
--to=dev@rjt.dev \
--cc=61302@debbugs.gnu.org \
--cc=dgutov@yandex.ru \
--cc=eliz@gnu.org \
--cc=jostein@kjonigsen.net \
/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).