Unnamed repository; edit this file 'description' to name the repository.
chore: update tree-sitter-rust to v0.21.0 (#10365)
* chore: update tree-sitter-rust to 0.21.0 * fix: pretty print and textobject tests
Pedro Fedricci 2024-04-15
parent 1245760 · commit 0546273
-rw-r--r--helix-core/src/syntax.rs11
-rw-r--r--languages.toml2
-rw-r--r--runtime/queries/rust/highlights.scm2
3 files changed, 8 insertions, 7 deletions
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 78abc0b0..3cf818f6 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -2765,10 +2765,10 @@ mod test {
)
};
- test("quantified_nodes", 1..36);
+ test("quantified_nodes", 1..37);
// NOTE: Enable after implementing proper node group capturing
- // test("quantified_nodes_grouped", 1..36);
- // test("multiple_nodes_grouped", 1..36);
+ // test("quantified_nodes_grouped", 1..37);
+ // test("multiple_nodes_grouped", 1..37);
}
#[test]
@@ -2939,7 +2939,7 @@ mod test {
#[test]
fn test_pretty_print() {
- let source = r#"/// Hello"#;
+ let source = r#"// Hello"#;
assert_pretty_print("rust", source, "(line_comment)", 0, source.len());
// A large tree should be indented with fields:
@@ -2958,7 +2958,8 @@ mod test {
" (macro_invocation\n",
" macro: (identifier)\n",
" (token_tree\n",
- " (string_literal))))))",
+ " (string_literal\n",
+ " (string_content)))))))",
),
0,
source.len(),
diff --git a/languages.toml b/languages.toml
index 1a345add..ea1607d8 100644
--- a/languages.toml
+++ b/languages.toml
@@ -250,7 +250,7 @@ args = { attachCommands = [ "platform select remote-gdb-server", "platform conne
[[grammar]]
name = "rust"
-source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9" }
+source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "473634230435c18033384bebaa6d6a17c2523281" }
[[language]]
name = "sway"
diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm
index 09068b4f..1c0f799b 100644
--- a/runtime/queries/rust/highlights.scm
+++ b/runtime/queries/rust/highlights.scm
@@ -51,7 +51,7 @@
(lifetime
"'" @label
(identifier) @label)
-(loop_label
+(label
"'" @label
(identifier) @label)