benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-18 19:30:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(rust): regex injections, highlights

Browse source 
**Problem:** Rust's regex injections were not applied since the string
content is behind a `(string_content)` node, and the injections were
applied to the parent node without the `include-children` directive.

**Solution:** Apply the injections to the string content. Also highlight
them accordingly.
This commit is contained in:
Riley Bruins 2024-10-23 21:18:39 -07:00 • committed by Christian Clason
parent a8b7da35e5
commit 00d2190683
2 changed files with 52 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

44
queries/rust/highlights.scm
View file

@ -475,3 +475,47 @@
(block_comment (block_comment
(doc_comment)) @comment.documentation (doc_comment)) @comment.documentation
(call_expression
function: (scoped_identifier
path: (identifier) @_regex
(#any-of? @_regex "Regex" "ByteRegexBuilder")
name: (identifier) @_new
(#eq? @_new "new"))
arguments: (arguments
(raw_string_literal
(string_content) @string.regexp)))
(call_expression
function: (scoped_identifier
path: (scoped_identifier
(identifier) @_regex
(#any-of? @_regex "Regex" "ByteRegexBuilder") .)
name: (identifier) @_new
(#eq? @_new "new"))
arguments: (arguments
(raw_string_literal
(string_content) @string.regexp)))
(call_expression
function: (scoped_identifier
path: (identifier) @_regex
(#any-of? @_regex "RegexSet" "RegexSetBuilder")
name: (identifier) @_new
(#eq? @_new "new"))
arguments: (arguments
(array_expression
(raw_string_literal
(string_content) @string.regexp))))
(call_expression
function: (scoped_identifier
path: (scoped_identifier
(identifier) @_regex
(#any-of? @_regex "RegexSet" "RegexSetBuilder") .)
name: (identifier) @_new
(#eq? @_new "new"))
arguments: (arguments
(array_expression
(raw_string_literal
(string_content) @string.regexp))))

12
queries/rust/injections.scm
View file

@ -49,7 +49,8 @@
name: (identifier) @_new name: (identifier) @_new
(#eq? @_new "new")) (#eq? @_new "new"))
arguments: (arguments arguments: (arguments
(raw_string_literal) @injection.content) (raw_string_literal
(string_content) @injection.content))
(#set! injection.language "regex")) (#set! injection.language "regex"))
(call_expression (call_expression
@ -60,7 +61,8 @@
name: (identifier) @_new name: (identifier) @_new
(#eq? @_new "new")) (#eq? @_new "new"))
arguments: (arguments arguments: (arguments
(raw_string_literal) @injection.content) (raw_string_literal
(string_content) @injection.content))
(#set! injection.language "regex")) (#set! injection.language "regex"))
(call_expression (call_expression
@ -71,7 +73,8 @@
(#eq? @_new "new")) (#eq? @_new "new"))
arguments: (arguments arguments: (arguments
(array_expression (array_expression
(raw_string_literal) @injection.content)) (raw_string_literal
(string_content) @injection.content)))
(#set! injection.language "regex")) (#set! injection.language "regex"))
(call_expression (call_expression
@ -83,7 +86,8 @@
(#eq? @_new "new")) (#eq? @_new "new"))
arguments: (arguments arguments: (arguments
(array_expression (array_expression
(raw_string_literal) @injection.content)) (raw_string_literal
(string_content) @injection.content)))
(#set! injection.language "regex")) (#set! injection.language "regex"))
((block_comment) @injection.content ((block_comment) @injection.content