-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
Update tree-sitter-julia #10031
Update tree-sitter-julia #10031
Conversation
049e7ab
to
192d9a1
Compare
Update julia parser to latest version, along with: - updating the queries, - pulling changes from `nvim-treesitter`’s queries (as the maintainters of the parser update the queries there), - reversing the queries’ order to be compatible with upstream.
192d9a1
to
0bb3b18
Compare
(sorry for the noise) I also didn't get an issue with this which I had with the previous queries, that is the entire file lost color while editing randomly ( |
Happy that you like it and thank you testing it! I think it will a bit of time before it gets merged, since the ordering of the queries MR (on which this one depends) has to be merged first, but hopefully before the next majour release! |
17bb6b4
into
helix-editor:reverse-query-precedence-ordering
Update julia parser to latest version, along with: - updating the queries, - pulling changes from `nvim-treesitter`’s queries (as the maintainters of the parser update the queries there), - reversing the queries’ order to be compatible with upstream.
@Iorvethe The same COPR now builds against the head of reverse-query-precedence-ordering branch. |
I just tried it and it’s broken indeed… This is very strange as this branch was started from The culprits seem to be the first few queries using Update: see #10793 |
This PR updates the parser to the latest version, and adapts the queries accordingly. Some changes were also brought from
nvim-treesitter
’s queries as well.In light of the reversing of the queries (#9458), the order has also been changed. It tried to mimick the sections of the previous queries, while also following those of
nvim-treesitter
to ease future updates (the diff will be more useful).Everything seems to be working. There is just a tiny issue with indentation after compound blocks or for-loops. Specifically, the outdent after them should not happen. For example, the cursor on the line ends up here:
While it should end up like so:
This worked before (on 23.10, but not on master), and the indent queries remain more or less the same, so I don’t see what should be changed. From my tests, it seems recurring in other languages likefish
that finish indent scopes with a keyword that is not indented. Any help is welcome!I found out about the indentation heuristic, and the peculiar indent seems to be from it. So, not an issue with the PR. It would still be better if we could have the hybrid indentation (the default) while avoiding the outdent after the
end
.Also, it would be nice if those who worked on the queries previously could take a look to see whether everything is working and whether they are fine with the new structure.
Closes #7309