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

feat: update to tree-sitter 0.24 #142

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

ObserverOfTime
Copy link
Contributor

  • Add the new tree-sitter.json config file
  • Remove existing binding files
  • Run tree-sitter init to create them anew
    • Manually tweak a few of them
  • Include Cargo.lock in versioning instructions

@@ -65,7 +65,7 @@ Steps to perform a release:

1. Bump and tag the version:

**First** bump `Cargo.toml`, `pyproject.toml`, and `Makefile` to the new version. **Then** bump the package:
**First** bump `Cargo.toml`, `Cargo.lock`, `pyproject.toml`, and `Makefile` to the new version. **Then** bump the package:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The next tree-sitter CLI release will finally have a command to handle this.

@dundargoc
Copy link
Member

Combining automatically generated code with manual tweaks sounds like it could be a problem if something goes wrong and we need to bisect/recreate. Could we separate the automatic and manual changes with different commits/PRs perhaps?

@dundargoc
Copy link
Member

Oh, and if possible, think we could use the latest tree-sitter commit (since it shows the exact tree-sitter SHA that was used to generate)? It could become relevant to know the exact TS version if things go wrong.

@ObserverOfTime
Copy link
Contributor Author

ObserverOfTime commented Oct 28, 2024

Can I just specify what was manually changed instead?

@justinmk
Copy link
Member

That would be a good starting point. I will separate those changes into a separate commit if you can't.

@clason
Copy link
Member

clason commented Oct 28, 2024

If Justin won't, I will require separate atomic commits. These sort of "update repo" PRs are simply unacceptable (even though -- most of -- the changes are welcome).

Oh, and if possible, think we could use the latest tree-sitter commit (since it shows the exact tree-sitter SHA that was used to generate)

I would prefer to stick to releases for generating files; 0.25 will be a breaking change (new ABI version), and I'd like to separate that step for later (even though we'd have to wait a bit for the parser annotation).

@dundargoc
Copy link
Member

I would prefer to stick to releases for generating files

Same, but I'm pretty sure this was not generated from a stable version but from a random commit (no idea which one). I figured if we were going with a non-release commit then at least we could pick the one the let us know which one.

@clason
Copy link
Member

clason commented Oct 28, 2024

Same, but I'm pretty sure this was not generated from a stable version but from a random commit (no idea which one)

Then this is another reason to ask for a change. These files should be generated with 0.24.3 (or 0.24.4 if that is imminent, in which case we should park this).

@ObserverOfTime
Copy link
Contributor Author

Might as well park it till 0.25 then.

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.

4 participants