Skip to content

feat(rust): array_expression as @parameter #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kiyoon merged 1 commit into from
May 23, 2025
Merged

feat(rust): array_expression as @parameter #767

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 136 additions & 0 deletions queries/rust/textobjects.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,13 @@
","? @_end)
(#make-range! "parameter.outer" @parameter.inner @_end))

; last element, with trailing comma
((parameters
(self_parameter) @_start
.
"," @_end .)
(#make-range! "parameter.outer" @_start @_end))

((parameters
"," @_start
.
Expand All @@ -239,6 +246,13 @@
","? @_end)
(#make-range! "parameter.outer" @parameter.inner @_end))

; last element, with trailing comma
((parameters
(parameter) @_start
.
"," @_end .)
(#make-range! "parameter.outer" @_start @_end))

((parameters
"," @_start
.
Expand All @@ -252,6 +266,13 @@
","? @_end)
(#make-range! "parameter.outer" @parameter.inner @_end))

; last element, with trailing comma
((parameters
(type_identifier) @_start
.
"," @_end .)
(#make-range! "parameter.outer" @_start @_end))

((type_parameters
"," @_start
.
Expand All @@ -265,6 +286,13 @@
","? @_end)
(#make-range! "parameter.outer" @parameter.inner @_end))

; last element, with trailing comma
((type_parameters
(_) @_start
.
"," @_end .)
(#make-range! "parameter.outer" @_start @_end))

((tuple_pattern
"," @_start
.
Expand All @@ -278,6 +306,13 @@
","? @_end)
(#make-range! "parameter.outer" @parameter.inner @_end))

; last element, with trailing comma
((tuple_pattern
(_) @_start
.
"," @_end .)
(#make-range! "parameter.outer" @_start @_end))

((tuple_struct_pattern
"," @_start
.
Expand All @@ -291,6 +326,13 @@
","? @_end)
(#make-range! "parameter.outer" @parameter.inner @_end))

; last element, with trailing comma
((tuple_struct_pattern
(_) @_start
.
"," @_end .)
(#make-range! "parameter.outer" @_start @_end))

(tuple_expression
"," @_start
.
Expand All @@ -304,6 +346,13 @@
","? @_end
(#make-range! "parameter.outer" @parameter.inner @_end))

; last element, with trailing comma
((tuple_expression
(_) @_start
.
"," @_end .)
(#make-range! "parameter.outer" @_start @_end))

((tuple_type
"," @_start
.
Expand All @@ -317,6 +366,13 @@
","? @_end)
(#make-range! "parameter.outer" @parameter.inner @_end))

; last element, with trailing comma
((tuple_type
(_) @_start
.
"," @_end .)
(#make-range! "parameter.outer" @_start @_end))

(struct_item
body: (field_declaration_list
"," @_start
Expand All @@ -332,6 +388,15 @@
","? @_end
(#make-range! "parameter.outer" @parameter.inner @_end)))

; last element, with trailing comma
(struct_item
body: (field_declaration_list
(_) @_start
.
"," @_end
.
(#make-range! "parameter.outer" @_start @_end)))

(struct_expression
body: (field_initializer_list
"," @_start
Expand All @@ -347,6 +412,15 @@
","? @_end
(#make-range! "parameter.outer" @parameter.inner @_end)))

; last element, with trailing comma
(struct_expression
body: (field_initializer_list
(_) @_start
.
"," @_end
.
(#make-range! "parameter.outer" @_start @_end)))

((closure_parameters
"," @_start
.
Expand All @@ -360,6 +434,13 @@
","? @_end)
(#make-range! "parameter.outer" @parameter.inner @_end))

; last element, with trailing comma
((closure_parameters
(_) @_start
.
"," @_end .)
(#make-range! "parameter.outer" @_start @_end))

((arguments
"," @_start
.
Expand All @@ -373,6 +454,13 @@
","? @_end)
(#make-range! "parameter.outer" @parameter.inner @_end))

; last element, with trailing comma
((arguments
(_) @_start
.
"," @_end .)
(#make-range! "parameter.outer" @_start @_end))

((type_arguments
"," @_start
.
Expand All @@ -386,6 +474,13 @@
","? @_end)
(#make-range! "parameter.outer" @parameter.inner @_end))

; last element, with trailing comma
((type_arguments
(_) @_start
.
"," @_end .)
(#make-range! "parameter.outer" @_start @_end))

((token_tree
"," @_start
.
Expand All @@ -399,6 +494,13 @@
","? @_end)
(#make-range! "parameter.outer" @parameter.inner @_end))

; last element, with trailing comma
((token_tree
(_) @_start
.
"," @_end .)
(#make-range! "parameter.outer" @_start @_end))

(scoped_use_list
list: (use_list
"," @_start
Expand All @@ -414,6 +516,40 @@
","? @_end
(#make-range! "parameter.outer" @parameter.inner @_end)))

; last element, with trailing comma
(scoped_use_list
list: (use_list
(_) @_start
.
"," @_end
.
(#make-range! "parameter.outer" @_start @_end)))

(array_expression
(_) @parameter.inner)

; first element, with or without comma
((array_expression
.
(_) @_start
.
","? @_end)
(#make-range! "parameter.outer" @_start @_end))

; second to last element (with leading comma)
((array_expression
"," @_start
.
(_) @_end)
(#make-range! "parameter.outer" @_start @_end))

; last element, with trailing comma
((array_expression
(_) @_start
.
"," @_end .)
(#make-range! "parameter.outer" @_start @_end))

[
(integer_literal)
(float_literal)
Expand Down
Loading