From 6d3ebd4ffea4f1c563395eb7cc30be0172e92e65 Mon Sep 17 00:00:00 2001 From: Chris Biscardi Date: Mon, 23 Mar 2026 17:29:01 -0700 Subject: [PATCH] Upgrade tree-sitter-rust, de-list bsn (#52251) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Context Recently, we put bsn in the list of "macros to not reparse as rust" (#51353). We have since updated tree-sitter-rust to better handle the `@"string"`, `:"string"`, etc cases, and can un-list bsn from the special casing. on main, the highlighting currently looks like this for `bsn` and for `not` (represents "other macros"). Note the `:"player.bsn"` string is re-parsed as rust tokens. Screenshot 2026-03-23 at 9 33
35 AM This pr, plus the tree-sitter-rust updates results in better handling by default. Screenshot 2026-03-23 at 11 38
47 AM Release Notes: - N/A --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- crates/languages/src/rust/injections.scm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 63ae6c4c708a452d4ce9e694c325970428f17540..194c544cdab73b4e64d0fb3e085f7c55072c1589 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18549,9 +18549,9 @@ dependencies = [ [[package]] name = "tree-sitter-rust" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b18034c684a2420722be8b2a91c9c44f2546b631c039edf575ccba8c61be1" +checksum = "f715f73a0687261ddb686f0d64a1e5af57bd199c4d12be5fdda6676ce1885bf9" dependencies = [ "cc", "tree-sitter-language", diff --git a/Cargo.toml b/Cargo.toml index dd426748606407aad3fdce359bc4ba0abe64727d..f14be5eb54f459054c1d411a08d0318189dfdf42 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -752,7 +752,7 @@ tree-sitter-md = { git = "https://github.com/tree-sitter-grammars/tree-sitter-ma tree-sitter-python = "0.25" tree-sitter-regex = "0.24" tree-sitter-ruby = "0.23" -tree-sitter-rust = "0.24" +tree-sitter-rust = "0.24.1" tree-sitter-typescript = { git = "https://github.com/zed-industries/tree-sitter-typescript", rev = "e2c53597d6a5d9cf7bbe8dccde576fe1e46c5899" } # https://github.com/tree-sitter/tree-sitter-typescript/pull/347 tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" } tracing = "0.1.40" diff --git a/crates/languages/src/rust/injections.scm b/crates/languages/src/rust/injections.scm index c50694dc9e0b90d3e31bc1147e59eea7ff402efa..89d839282d3388f450f9ebdb923167f0986f349c 100644 --- a/crates/languages/src/rust/injections.scm +++ b/crates/languages/src/rust/injections.scm @@ -10,7 +10,7 @@ (scoped_identifier (identifier) @_macro_name .) ] - (#not-any-of? @_macro_name "view" "html" "bsn") + (#not-any-of? @_macro_name "view" "html") (token_tree) @injection.content (#set! injection.language "rust"))