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(queries): Update Zig highlights scm #688

Merged
merged 1 commit into from
Sep 9, 2024

Conversation

sbancuz
Copy link
Contributor

@sbancuz sbancuz commented Jul 30, 2024

@sbancuz sbancuz changed the title chore: bump Zig highlights feat(queries): Update Zig highlights scm Aug 14, 2024
@sbancuz
Copy link
Contributor Author

sbancuz commented Sep 3, 2024

@jcs090218 can you look at this pr? Zig current highlights don't work with the new versions of the language. Also this may also close #624

EDIT: I also tried to update to the new upstream version https://github.com/tree-sitter-grammars/tree-sitter-zig with the updated highlights from neovim but i couldn't manage to compile it correctly. Kept getting ABI version mismatch for some reason and scripts/compile zig didn't generate the new grammar. I could make the new commit but I'd have no way of knowing if it actually worked or not.

@jcs090218
Copy link
Member

Can you try to see if it works on your side? I'm pretty sure I got it from the nvim repo a while ago. 🤔

@sbancuz
Copy link
Contributor Author

sbancuz commented Sep 3, 2024

I'm not too sure what do you mean, but I can confirm that the highlights in my commit do work. They are not the best though. The old ones don't. Some keywords are not being highlighted

image

If you want I can retry with the new upstream repo so this pr kill two birds with one stone, but I'm not sure on how to resolve the issues I'm having

@jcs090218
Copy link
Member

jcs090218 commented Sep 8, 2024

Sorry for the late reply! I have been really busy recently!

I got the queries from the nvim repo, but there were errors so we couldn't use it directly. 🤔

EDIT: I also tried to update to the new upstream version https://github.com/tree-sitter-grammars/tree-sitter-zig with the updated highlights from neovim but i couldn't manage to compile it correctly. Kept getting ABI version mismatch for some reason and scripts/compile zig didn't generate the new grammar. I could make the new commit but I'd have no way of knowing if it actually worked or not.

If the CI passed, then it should be good! 👍 You can try to compile it locally or open a PR with the updated upstream!

@sbancuz sbancuz force-pushed the master branch 4 times, most recently from 19ca254 to 5129489 Compare September 8, 2024 18:08
@sbancuz
Copy link
Contributor Author

sbancuz commented Sep 8, 2024

@jcs090218 I had to fight a bit with git submodules but in theory the CI should pass, I enabled it in my fork and it ran without any problems. This has the new repo and new-er highlights than the one from before. Although I didn't manage to test it on my machine since I kept getting the same problem of ABI incompatibility.

.gitmodules Outdated Show resolved Hide resolved
@sbancuz
Copy link
Contributor Author

sbancuz commented Sep 8, 2024

Don't run the CI again because I think I saw some of the tests failing and not just because of gpr. Somehow on macos it failed on everything.

EDIT: also when it's ready I will squash the commits if you need it

@jcs090218
Copy link
Member

Just let me know if you need a re-run! :)

@sbancuz sbancuz reopened this Sep 9, 2024
@sbancuz
Copy link
Contributor Author

sbancuz commented Sep 9, 2024

Ok my CI worked, so it should be all good I hope.

@jcs090218 jcs090218 merged commit 7a478bf into emacs-tree-sitter:master Sep 9, 2024
6 checks passed
@jcs090218
Copy link
Member

Thank you for your hard work! 🚀

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