Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update tree-sitter-rust to v0.21.0 #10365

Merged

Conversation

pedromfedricci
Copy link
Contributor

Updates tree-sitter-rust to v0.21.0. There were a number of changes since 0.20.3 (diff). The only breaking change (commit) that I found was renaming loop_label node to label, which is addressed in the highlights.scm file. I haven't experienced any regressions, but it would be great if other people could try it out too before merging.

@archseer
Copy link
Member

@the-mikedavis
Copy link
Member

the-mikedavis commented Apr 12, 2024

We may want to add that injection later though, see #9695

Also see #9695 for the changes to fix the test cases. We use tree-sitter-rust in some unit tests in helix-core

@the-mikedavis the-mikedavis added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. A-language-support Area: Support for programming/text languages labels Apr 12, 2024
@pedromfedricci
Copy link
Contributor Author

Hmm my bad, I checked for open PRs related tree-sitter-rust and didn't realize that #9695 draft was related. I will fix the test cases.

@archseer
Copy link
Member

We can probably just merge #9695.

@pedromfedricci
Copy link
Contributor Author

Yeah this is pretty much covered by #9695 if you prefer to close this one and wait/merge the other.

@pascalkuthe
Copy link
Member

We can probably just merge #9695.

The problem mentioned there regarding combined I jects is quite noticeable unfortunately and I looked into it, a fix is not trivial

@the-mikedavis
Copy link
Member

Updating the grammar is a kind of side quest for #9695 anyways, I'd be happy to rebase on this change and get any fixes in the newer version on master faster

@the-mikedavis the-mikedavis added S-waiting-on-review Status: Awaiting review from a maintainer. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 15, 2024
@pascalkuthe pascalkuthe merged commit 0546273 into helix-editor:master Apr 15, 2024
6 checks passed
@pedromfedricci pedromfedricci deleted the tree-sitter-rust-v0.21.0 branch April 15, 2024 23:25
shaleh pushed a commit to shaleh/helix that referenced this pull request Apr 16, 2024
* chore: update tree-sitter-rust to 0.21.0

* fix: pretty print and textobject tests
postsolar pushed a commit to postsolar/helix that referenced this pull request Apr 20, 2024
* chore: update tree-sitter-rust to 0.21.0

* fix: pretty print and textobject tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-language-support Area: Support for programming/text languages S-waiting-on-review Status: Awaiting review from a maintainer.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants