atom / language-java

Java package for Atom
Other
62 stars 58 forks source link

Update the tree-sitter dependency #251

Closed icecream17 closed 2 years ago

icecream17 commented 2 years ago

Description of the Change

Updates tree-sitter-java to v19

Or rather, a fork of tree-sitter-java. So now I made a fork that combines v19 and the old fork together.

https://github.com/tree-sitter/tree-sitter-java/compare/master...icecream17:cd65bb4cce7b2ba4f444aadd2202b12c484de036 https://github.com/tree-sitter/tree-sitter-java/compare/master...sadikovi:master

My fork passes the tests on the tree-sitter-java repo, but not the tests on this repo.

Part of https://github.com/atom/atom/issues/22129 and https://github.com/icecream17/atom-update-backlog/blob/main/Languages.md

Don't merge yet

Alternate Designs

Benefits

Possible Drawbacks

Applicable Issues

https://github.com/atom/atom/issues/22129

sadikovi commented 2 years ago

The tree-sitter fork actually has some bug fixes that are not in the main repo. Maybe it would be easier to rebase the fork 🤔.

icecream17 commented 2 years ago

Yeah rebasing would be better.

I tried to keep the bug fixes in the fork but it seems like somehow the tests are broken (it's either the updates or I did something wrong)

Also, just rebasing doesn't work, edit: because of the regenerate command?

https://github.com/tree-sitter/tree-sitter-java/compare/master...icecream17:cd65bb4cce7b2ba4f444aadd2202b12c484de036 https://github.com/tree-sitter/tree-sitter-java/compare/master...sadikovi:master

Unkept changes: Identifier (it was fixed more thoroughly in the main repo) New changes: Updating queries

sadikovi commented 2 years ago

Thanks, rebasing should have worked 🤔 although it might require conflict resolution. Either way, would you be able to fix the tests?

icecream17 commented 2 years ago

I'm not sure why the tests are failing right now 😅

sadikovi commented 2 years ago

You can run the tests locally with apm test (it takes approximately 10-20sec) and check if they are failing there.

darangi commented 2 years ago

@icecream17 are you still looking into this?

icecream17 commented 2 years ago

Not right now; feel free to close this