Skip to content

Bump tree-sitter for fix to wasm loading of grammars w/ reserved words#52856

Merged
maxbrunsfeld merged 3 commits intomainfrom
bump-tree-sitter-for-reserved-word-set-fix
Apr 1, 2026
Merged

Bump tree-sitter for fix to wasm loading of grammars w/ reserved words#52856
maxbrunsfeld merged 3 commits intomainfrom
bump-tree-sitter-for-reserved-word-set-fix

Conversation

@maxbrunsfeld
Copy link
Copy Markdown
Collaborator

This PR bumps Tree-sitter for this crash fix tree-sitter/tree-sitter#5475

Release Notes:

  • Fixed a crash that could occasionally occur when parsing files using certain language extensions

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Mar 31, 2026
@maxbrunsfeld maxbrunsfeld marked this pull request as ready for review March 31, 2026 21:18
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Mar 31, 2026
Copy link
Copy Markdown
Contributor

@ChristopherBiscardi ChristopherBiscardi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@ChristopherBiscardi
Copy link
Copy Markdown
Contributor

ChristopherBiscardi commented Mar 31, 2026

couple changes to the api usage need to happen though. looks like maybe multiple crate versions

Copy link
Copy Markdown
Contributor

@ChristopherBiscardi ChristopherBiscardi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like the wasmtime bump is going to be a decent amount of changes

@ChristopherBiscardi
Copy link
Copy Markdown
Contributor

tldr;

  • wasmtime is currently on v43 on crates.io
  • zed's workspace is on wasmtime v33
  • tree-sitter bumps to v36, causing at least a bump to zed's wasmtime and wasmtime-wasi to v36, which seems to have a bunch of changes.

@maxbrunsfeld
Copy link
Copy Markdown
Collaborator Author

Oh, I didn't expect us to bump wasmtime in a patch release. I might have to backport this fix in Tree-sitter, so we can avoid bumping wasmtime.

@maxbrunsfeld
Copy link
Copy Markdown
Collaborator Author

Actually, I'm going to try to just bump Wasmtime to match in Zed.

@maxbrunsfeld
Copy link
Copy Markdown
Collaborator Author

maxbrunsfeld commented Mar 31, 2026

Ok, upgrading zed's Wasmtime to 36 was not complicated, and I think that has other benefits.

@maxbrunsfeld maxbrunsfeld enabled auto-merge (squash) March 31, 2026 23:40
@maxbrunsfeld maxbrunsfeld requested a review from MrSubidubi March 31, 2026 23:44
Copy link
Copy Markdown
Contributor

@ChristopherBiscardi ChristopherBiscardi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sweet, compiles and runs without issue on my end.

@maxbrunsfeld maxbrunsfeld merged commit 3b6252c into main Apr 1, 2026
30 checks passed
@maxbrunsfeld maxbrunsfeld deleted the bump-tree-sitter-for-reserved-word-set-fix branch April 1, 2026 01:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants