From: Dmitry Gutov <dgutov@yandex.ru>
To: Randy Taylor <dev@rjt.dev>
Cc: eliz@gnu.org, "Jostein Kjønigsen" <jostein@secure.kjonigsen.net>,
"Yuan Fu" <casouri@gmail.com>,
61302@debbugs.gnu.org
Subject: bug#61302: 29.0.60; rust-ts-mode does not show function-invocation on field-properties
Date: Sun, 19 Feb 2023 02:13:55 +0200 [thread overview]
Message-ID: <19be600c-f358-3824-53d2-fd00d074c601@yandex.ru> (raw)
In-Reply-To: <JUtSX2GcLWaJZ_kAhHaMBJo4X55yu7ep7wD3r47bxcmgRkrwVB_wdlvblbRF1IH4H196hjJw3r1v5Jh3ukslH5x3pb91kzGXffVyaow21TY=@rjt.dev>
[-- Attachment #1: Type: text/plain, Size: 2075 bytes --]
On 19/02/2023 01:31, Randy Taylor wrote:
> Fix one bug, introduce another 😉.
>
> Any use declaration tail (I guess that's the lingo we're using?) should not have a face applied to it if it's lowercase.
I guess we do. Unless you have better naming suggestions ;-)
> For example:
> ```
> use deeply::nested::function as other_function;
> ```
> function should not have any face applied to it.
>
> ```
> use a::b::{C, d, e::F, g::h::I, g::h::i};
> ```
> i should not have any face applied to it.
>
> Only if they are capitalized should we give them a face: font-lock-type-face.
> As it stands now, they are all font-lock-constant-face.
>
> The previous patch was perfect except for the missing use_as_clause queries - if I add those back, I think everything is good unless I'm missing something.
Thanks for catching that, I missed one treesit-node-parent call when
inlining a function.
>>> The variable feature is highlighting some things incorrectly (it was before too, but I think it's a little worse now).
>>> Adding these to rust-ts-mode--variable-p takes care of the issues that I see.
>>> `((equal "extern_crate_declaration" parent-type) nil) ((equal "lifetime" parent-type) nil) ((equal "scoped_type_identifier" parent-type) nil) ((equal "use_as_clause" parent-type) nil) ((equal "use_list" parent-type) nil)`
>>
>> This should be taken care of by the new approach (enumeration of all
>> allowed parent types).
> Missing:
> (closure_parameters (identifier) @font-lock-variable-name-face)
This one goes into the 'definition' feature. I just made that change
today in emacs-29, check it out.
> (field_initializer value: (identifier) @font-lock-variable-name-face)
Thanks, added. Also added unary_expression.
> Would it be possible to alphabetize the queries in the variable feature BTW? It makes it easier to see what's there/missing.
> And you know I like things alphabetized 😉.
No problem! I generally like to group by functionality, but alphabetic
is fine, and this case seems particularly suited to it.
See the revised in attachment.
[-- Attachment #2: rust-ts-fontify-scope-v4.diff --]
[-- Type: text/x-patch, Size: 7178 bytes --]
diff --git a/lisp/progmodes/rust-ts-mode.el b/lisp/progmodes/rust-ts-mode.el
index e53cdb5ce7d..50df2543da1 100644
--- a/lisp/progmodes/rust-ts-mode.el
+++ b/lisp/progmodes/rust-ts-mode.el
@@ -209,50 +209,15 @@ rust-ts-mode--font-lock-settings
`((scoped_use_list path: (identifier) @font-lock-constant-face)
(scoped_use_list path: (scoped_identifier
name: (identifier) @font-lock-constant-face))
-
((use_as_clause alias: (identifier) @font-lock-type-face)
(:match "^[A-Z]" @font-lock-type-face))
((use_as_clause path: (identifier) @font-lock-type-face)
(:match "^[A-Z]" @font-lock-type-face))
- ((use_as_clause path:
- (scoped_identifier path: (_)
- name: (identifier) @font-lock-type-face))
- (:match "^[A-Z]" @font-lock-type-face))
- (use_as_clause path: (scoped_identifier name: (identifier) @default))
-
- ((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) @default))
-
- (use_declaration
- argument: (scoped_identifier
- path: (scoped_identifier
- path: (_) @font-lock-constant-face
- name: (identifier) @font-lock-constant-face)
- name: (identifier) @default))
-
- (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) @default)
- ((use_list (scoped_identifier path: (_)
- name: (identifier) @font-lock-type-face))
- (:match "^[A-Z]" @font-lock-type-face))
- (use_list (scoped_identifier path: (_)
- name: (identifier) @default))
- (use_wildcard (scoped_identifier
- name: (identifier) @font-lock-constant-face))
-
+ (use_wildcard [(identifier) @rust-ts-mode--fontify-scope
+ (scoped_identifier
+ name: (identifier) @rust-ts-mode--fontify-scope)])
(enum_variant name: (identifier) @font-lock-type-face)
(match_arm
pattern: (match_pattern (_ type: (identifier) @font-lock-type-face)))
@@ -263,31 +228,13 @@ 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
- path: [(identifier) @font-lock-type-face
- (scoped_identifier
- name: (identifier) @font-lock-type-face)])
- (:match "^[A-Z]" @font-lock-type-face))
+ ((scoped_identifier name: (identifier) @rust-ts-mode--fontify-tail))
((scoped_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
- ;; Ensure function calls aren't highlighted as types.
- (call_expression function: (scoped_identifier name: (identifier) @default)))
+ ((scoped_identifier path: (identifier) @rust-ts-mode--fontify-scope))
+ (type_identifier) @font-lock-type-face)
:language 'rust
:feature 'property
@@ -303,9 +250,25 @@ rust-ts-mode--font-lock-settings
:language 'rust
:feature 'variable
- '((identifier) @font-lock-variable-name-face
- ;; Everything in a token_tree is an identifier.
- (token_tree (identifier) @default))
+ '((assignment_expression right: (identifier) @font-lock-variable-name-face)
+ (arguments (identifier) @font-lock-variable-name-face)
+ (array_expression (identifier) @font-lock-variable-name-face)
+ (binary_expression left: (identifier) @font-lock-variable-name-face)
+ (binary_expression right: (identifier) @font-lock-variable-name-face)
+ (block (identifier) @font-lock-variable-name-face)
+ (compound_assignment_expr right: (identifier) @font-lock-variable-name-face)
+ (field_expression value: (identifier) @font-lock-variable-name-face)
+ (field_initializer value: (identifier) @font-lock-variable-name-face)
+ (if_expression condition: (identifier) @font-lock-variable-name-face)
+ (let_condition value: (identifier) @font-lock-variable-name-face)
+ (let_declaration value: (identifier) @font-lock-variable-name-face)
+ (match_arm value: (identifier) @font-lock-variable-name-face)
+ (match_expression value: (identifier) @font-lock-variable-name-face)
+ (reference_expression value: (identifier) @font-lock-variable-name-face)
+ (return_expression (identifier) @font-lock-variable-name-face)
+ (tuple_expression (identifier) @font-lock-variable-name-face)
+ (unary_expression (identifier) @font-lock-variable-name-face)
+ (while_expression condition: (identifier) @font-lock-variable-name-face))
:language 'rust
:feature 'escape-sequence
@@ -318,6 +281,28 @@ rust-ts-mode--font-lock-settings
'((ERROR) @font-lock-warning-face))
"Tree-sitter font-lock settings for `rust-ts-mode'.")
+(defun rust-ts-mode--fontify-scope (node override start end &optional tail-p)
+ (let* ((case-fold-search nil)
+ (face
+ (cond
+ ((string-match-p "^[A-Z]" (treesit-node-text node))
+ 'font-lock-type-face)
+ ((and
+ tail-p
+ (string-match-p
+ "\\`\\(?:use_list\\|call_expression\\|use_as_clause\\|use_declaration\\)\\'"
+ (treesit-node-type (treesit-node-parent (treesit-node-parent node)))))
+ nil)
+ (t 'font-lock-constant-face))))
+ (when face
+ (treesit-fontify-with-override
+ (treesit-node-start node) (treesit-node-end node)
+ face
+ override start end))))
+
+(defun rust-ts-mode--fontify-tail (node override start end)
+ (rust-ts-mode--fontify-scope node override start end t))
+
(defalias 'rust-ts-mode--fontify-pattern
(and
(treesit-available-p)
next prev parent reply other threads:[~2023-02-19 0:13 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
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 [this message]
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=19be600c-f358-3824-53d2-fd00d074c601@yandex.ru \
--to=dgutov@yandex.ru \
--cc=61302@debbugs.gnu.org \
--cc=casouri@gmail.com \
--cc=dev@rjt.dev \
--cc=eliz@gnu.org \
--cc=jostein@secure.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).