Update to latest tree-sitter commit

Max Brunsfeld created 3 years ago

This is needed for https://github.com/tree-sitter/tree-sitter/pull/1845

Change summary

Cargo.lock                        | 2 +-
Cargo.toml                        | 2 +-
crates/language/src/syntax_map.rs | 8 ++++++++
crates/text/src/text.rs           | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)

Detailed changes

Cargo.lock

@@ -5842,7 +5842,7 @@ dependencies = [
 [[package]]
 name = "tree-sitter"
 version = "0.20.8"
-source = "git+https://github.com/tree-sitter/tree-sitter?rev=477b6677537e89c7bdff14ce84dad6d23a6415bb#477b6677537e89c7bdff14ce84dad6d23a6415bb"
+source = "git+https://github.com/tree-sitter/tree-sitter?rev=366210ae925d7ea0891bc7a0c738f60c77c04d7b#366210ae925d7ea0891bc7a0c738f60c77c04d7b"
 dependencies = [
  "cc",
  "regex",

Cargo.toml

@@ -4,7 +4,7 @@ default-members = ["crates/zed"]
 resolver = "2"
 
 [patch.crates-io]
-tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "477b6677537e89c7bdff14ce84dad6d23a6415bb" }
+tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "366210ae925d7ea0891bc7a0c738f60c77c04d7b" }
 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

crates/language/src/syntax_map.rs

@@ -284,11 +284,19 @@ impl SyntaxSnapshot {
                 };
 
                 layer.tree.edit(&tree_edit);
+
                 if edit.new.start.0 < start_byte {
                     break;
                 }
             }
 
+            debug_assert!(
+                layer.tree.root_node().end_byte() <= text.len(),
+                "tree's size {}, is larger than text size {}",
+                layer.tree.root_node().end_byte(),
+                text.len(),
+            );
+
             layers.push(layer, text);
             cursor.next(text);
         }

crates/text/src/text.rs

@@ -2435,7 +2435,7 @@ impl ToOffset for PointUtf16 {
 
 impl ToOffset for usize {
     fn to_offset<'a>(&self, snapshot: &BufferSnapshot) -> usize {
-        assert!(*self <= snapshot.len(), "offset is out of range");
+        assert!(*self <= snapshot.len(), "offset {self} is out of range");
         *self
     }
 }