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

tree-sitter 0.24 upgrade #283

Merged
merged 6 commits into from
Nov 16, 2024
Merged

Conversation

mwhitworth
Copy link
Contributor

needs #279

changes required to upgrade to tree-sitter 0.24. But it looks like there is at least one issue with a 0.24 upgrade (#282), and upgrading to 0.23 has the advantage of moving Rust bindings to tree-sitter-language and simplifying further upgrades there.

@mwhitworth mwhitworth changed the title tree-sitter 0.24 tree-sitter 0.24 upgrade Oct 30, 2024
@matthias-Q
Copy link
Collaborator

@mwhitworth can you rebase main into your branch please? I have updated CI and also bumped tree-sitter to 0.23. CI should pass with tree-sitter 0.24 as well.

Once this lands I would make a new release.

@mwhitworth
Copy link
Contributor Author

I'm rebasing this now (and checking the diff)

I came across a message while cloning the repository, and some odd behaviour around bindings/swift/TreeSitterSQL/sql.h. This is because there are actually two copies of the file in the working tree. Running git clone on the repo displays the following message:

warning: the following paths have collided (e.g. case-sensitive paths
on a case-insensitive filesystem) and only one from the same
colliding group is in the working tree
  'bindings/swift/TreeSitterSQL/sql.h'
  'bindings/swift/TreeSitterSql/sql.h'

It might be clearest to fix this separately.

Copy link
Collaborator

@matthias-Q matthias-Q left a comment

Choose a reason for hiding this comment

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

LGTM. Can you make these two changes?

Cargo.toml Show resolved Hide resolved
bindings/rust/build.rs Show resolved Hide resolved
@mwhitworth
Copy link
Contributor Author

....
It might be clearest to fix this separately.

#290

Then I'll finalize this branch for merge.

@mwhitworth
Copy link
Contributor Author

With this rebase and some further fix commits, this should be good to go. Ideally there should be less fix commits for each tree-sitter release, but I suspect this is mostly an upstream issue. Since I've helped to apply tree-sitter upgrades across some other language grammars, I'll be paying attention to this.

@matthias-Q matthias-Q merged commit 4240085 into DerekStride:main Nov 16, 2024
4 checks passed
@matthias-Q
Copy link
Collaborator

Thanks @mwhitworth for the effort!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants