Max Brunsfeld created
Fixes https://github.com/zed-industries/community/issues/2290
This PR bumps Tree-sitter for
https://github.com/tree-sitter/tree-sitter/pull/2788.
Release Notes:
- Fixed a crash that could happen when opening certain large markdown
files.Cargo.lock | 2 +-
Cargo.toml | 3 ++-
crates/language/src/highlight_map.rs | 8 ++++----
crates/language/src/language.rs | 4 ++--
crates/language/src/syntax_map/syntax_map_tests.rs | 2 +-
crates/language2/src/highlight_map.rs | 8 ++++----
crates/language2/src/language2.rs | 4 ++--
crates/language2/src/syntax_map/syntax_map_tests.rs | 2 +-
crates/semantic_index/src/semantic_index_tests.rs | 4 ++--
crates/zed/src/languages/elixir/embedding.scm | 4 ++--
10 files changed, 21 insertions(+), 20 deletions(-)
@@ -9925,7 +9925,7 @@ dependencies = [
[[package]]
name = "tree-sitter"
version = "0.20.10"
-source = "git+https://github.com/tree-sitter/tree-sitter?rev=35a6052fbcafc5e5fc0f9415b8652be7dcaf7222#35a6052fbcafc5e5fc0f9415b8652be7dcaf7222"
+source = "git+https://github.com/tree-sitter/tree-sitter?rev=3b0159d25559b603af566ade3c83d930bf466db1#3b0159d25559b603af566ade3c83d930bf466db1"
dependencies = [
"cc",
"regex",
@@ -195,8 +195,9 @@ tree-sitter-lua = "0.0.14"
tree-sitter-nix = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7" }
tree-sitter-nu = { git = "https://github.com/nushell/tree-sitter-nu", rev = "786689b0562b9799ce53e824cb45a1a2a04dc673"}
tree-sitter-vue = {git = "https://github.com/zed-industries/tree-sitter-vue", rev = "9b6cb221ccb8d0b956fcb17e9a1efac2feefeb58"}
+
[patch.crates-io]
-tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "35a6052fbcafc5e5fc0f9415b8652be7dcaf7222" }
+tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "3b0159d25559b603af566ade3c83d930bf466db1" }
async-task = { git = "https://github.com/zed-industries/async-task", rev = "341b57d6de98cdfd7b418567b8de2022ca993a6e" }
# TODO - Remove when a version is released with this PR: https://github.com/servo/core-foundation-rs/pull/457
@@ -11,7 +11,7 @@ pub struct HighlightId(pub u32);
const DEFAULT_SYNTAX_HIGHLIGHT_ID: HighlightId = HighlightId(u32::MAX);
impl HighlightMap {
- pub fn new(capture_names: &[String], theme: &SyntaxTheme) -> Self {
+ pub fn new(capture_names: &[&str], theme: &SyntaxTheme) -> Self {
// For each capture name in the highlight query, find the longest
// key in the theme's syntax styles that matches all of the
// dot-separated components of the capture name.
@@ -98,9 +98,9 @@ mod tests {
);
let capture_names = &[
- "function.special".to_string(),
- "function.async.rust".to_string(),
- "variable.builtin.self".to_string(),
+ "function.special",
+ "function.async.rust",
+ "variable.builtin.self",
];
let map = HighlightMap::new(capture_names, &theme);
@@ -1383,7 +1383,7 @@ impl Language {
let query = Query::new(self.grammar_mut().ts_language, source)?;
let mut override_configs_by_id = HashMap::default();
- for (ix, name) in query.capture_names().iter().enumerate() {
+ for (ix, name) in query.capture_names().iter().copied().enumerate() {
if !name.starts_with('_') {
let value = self.config.overrides.remove(name).unwrap_or_default();
for server_name in &value.opt_into_language_servers {
@@ -1396,7 +1396,7 @@ impl Language {
}
}
- override_configs_by_id.insert(ix as u32, (name.clone(), value));
+ override_configs_by_id.insert(ix as u32, (name.into(), value));
}
}
@@ -1300,7 +1300,7 @@ fn assert_capture_ranges(
.collect::<Vec<_>>();
for capture in captures {
let name = &queries[capture.grammar_index].capture_names()[capture.index as usize];
- if highlight_query_capture_names.contains(&name.as_str()) {
+ if highlight_query_capture_names.contains(&name) {
actual_ranges.push(capture.node.byte_range());
}
}
@@ -11,7 +11,7 @@ pub struct HighlightId(pub u32);
const DEFAULT_SYNTAX_HIGHLIGHT_ID: HighlightId = HighlightId(u32::MAX);
impl HighlightMap {
- pub fn new(capture_names: &[String], theme: &SyntaxTheme) -> Self {
+ pub fn new(capture_names: &[&str], theme: &SyntaxTheme) -> Self {
// For each capture name in the highlight query, find the longest
// key in the theme's syntax styles that matches all of the
// dot-separated components of the capture name.
@@ -100,9 +100,9 @@ mod tests {
};
let capture_names = &[
- "function.special".to_string(),
- "function.async.rust".to_string(),
- "variable.builtin.self".to_string(),
+ "function.special",
+ "function.async.rust",
+ "variable.builtin.self",
];
let map = HighlightMap::new(capture_names, &theme);
@@ -1391,7 +1391,7 @@ impl Language {
let mut override_configs_by_id = HashMap::default();
for (ix, name) in query.capture_names().iter().enumerate() {
if !name.starts_with('_') {
- let value = self.config.overrides.remove(name).unwrap_or_default();
+ let value = self.config.overrides.remove(*name).unwrap_or_default();
for server_name in &value.opt_into_language_servers {
if !self
.config
@@ -1402,7 +1402,7 @@ impl Language {
}
}
- override_configs_by_id.insert(ix as u32, (name.clone(), value));
+ override_configs_by_id.insert(ix as u32, (name.to_string(), value));
}
}
@@ -1300,7 +1300,7 @@ fn assert_capture_ranges(
.collect::<Vec<_>>();
for capture in captures {
let name = &queries[capture.grammar_index].capture_names()[capture.index as usize];
- if highlight_query_capture_names.contains(&name.as_str()) {
+ if highlight_query_capture_names.contains(&name) {
actual_ranges.push(capture.node.byte_range());
}
}
@@ -1659,13 +1659,13 @@ fn elixir_lang() -> Arc<Language> {
target: (identifier) @name)
operator: "when")
])
- (#match? @name "^(def|defp|defdelegate|defguard|defguardp|defmacro|defmacrop|defn|defnp)$")) @item
+ (#any-match? @name "^(def|defp|defdelegate|defguard|defguardp|defmacro|defmacrop|defn|defnp)$")) @item
)
(call
target: (identifier) @name
(arguments (alias) @name)
- (#match? @name "^(defmodule|defprotocol)$")) @item
+ (#any-match? @name "^(defmodule|defprotocol)$")) @item
"#,
)
.unwrap(),
@@ -18,10 +18,10 @@
target: (identifier) @name)
operator: "when")
])
- (#match? @name "^(def|defp|defdelegate|defguard|defguardp|defmacro|defmacrop|defn|defnp)$")) @item
+ (#any-match? @name "^(def|defp|defdelegate|defguard|defguardp|defmacro|defmacrop|defn|defnp)$")) @item
)
(call
target: (identifier) @name
(arguments (alias) @name)
- (#match? @name "^(defmodule|defprotocol)$")) @item
+ (#any-match? @name "^(defmodule|defprotocol)$")) @item