Skip to content

Fix wasm loading of languages w/ multiple reserved word sets#5475

Merged
maxbrunsfeld merged 1 commit intomasterfrom
wasm-language-reserved-word-sets
Mar 31, 2026
Merged

Fix wasm loading of languages w/ multiple reserved word sets#5475
maxbrunsfeld merged 1 commit intomasterfrom
wasm-language-reserved-word-sets

Conversation

@maxbrunsfeld
Copy link
Copy Markdown
Contributor

Previously, languages with multiple reserved word sets were not handled properly when loaded from WASM. This would cause crashes during lexing.

@maxbrunsfeld maxbrunsfeld merged commit d3ff0ce into master Mar 31, 2026
27 checks passed
@maxbrunsfeld maxbrunsfeld deleted the wasm-language-reserved-word-sets branch March 31, 2026 05:27
github-actions bot pushed a commit that referenced this pull request Mar 31, 2026
@tree-sitter-ci-bot
Copy link
Copy Markdown

Successfully created backport PR for release-0.26:

@maxbrunsfeld
Copy link
Copy Markdown
Contributor Author

@WillLillis @amaanq Thanks for the review and backport. Are you cool with doing a patch release on the 0.26 line, so I can get this crash fix into Zed? I can do it, just wanted to check in since I typically cause chaos when I do releases these days 😓 .

@clason
Copy link
Copy Markdown
Member

clason commented Mar 31, 2026

The workflow is documented now (for no particular reason 😇 ) but I can do it if you prefer. Is it urgent or can it wait till the end of the week? (There's one or two backportable PRs that would be nice to include, but nothing that needs to hold up a release.)

@maxbrunsfeld
Copy link
Copy Markdown
Contributor Author

That would be wonderful @clason , and thanks for the docs pointer. Sooner would be better, since this crash is reachable for end users depending on what grammars they install.

@clason
Copy link
Copy Markdown
Member

clason commented Mar 31, 2026

#5479

@WillLillis
Copy link
Copy Markdown
Member

@maxbrunsfeld I don't have any issue with a patch release. If it's not super urgent like @clason said, I can take a look at those other PRs later tonight after work to get them in. If you need it sooner, that's fine too :)

@maxbrunsfeld
Copy link
Copy Markdown
Contributor Author

Tonight would be totally fine

@clason
Copy link
Copy Markdown
Member

clason commented Mar 31, 2026

Too late, it's already on crates.io!

@maxbrunsfeld
Copy link
Copy Markdown
Contributor Author

Just got the emails. Thank you!

maxbrunsfeld added a commit to zed-industries/zed that referenced this pull request Apr 1, 2026
#52856)

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants