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

slint: Update treesitter parser and queries #9551

Merged
merged 2 commits into from Feb 7, 2024

Conversation

hunger
Copy link
Contributor

@hunger hunger commented Feb 6, 2024

This PR switches the Slint language tree-sitter plugin over to the official one hosted in the slint-ui organiazation. It follows closely what we are doing in nvim-treesitter/nvim-treesitter#6027

@jrmoulton is aware and OK with this switch and started the transition on nvim-treesitter in nvim-treesitter/nvim-treesitter#5985

Unfortunately Jared did not have the time to see this one through, so I created a fresh PR to get hings into shape faster.

This PR also registers the slint! macro with the rust language as an injection.

Copy link
Member

@the-mikedavis the-mikedavis left a comment

Choose a reason for hiding this comment

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

Thanks for updating this! I left some minor comments about the keyword.control captures but otherwise this looks good

runtime/queries/slint/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/slint/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/slint/highlights.scm Outdated Show resolved Hide resolved
@hunger
Copy link
Contributor Author

hunger commented Feb 6, 2024

Oh, sorry for the keyword mess-up!

the-mikedavis
the-mikedavis previously approved these changes Feb 6, 2024
Copy link
Member

@the-mikedavis the-mikedavis left a comment

Choose a reason for hiding this comment

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

Thanks!

@the-mikedavis the-mikedavis added S-waiting-on-review Status: Awaiting review from a maintainer. A-language-support Area: Support for programming/text languages labels Feb 6, 2024
@hunger
Copy link
Contributor Author

hunger commented Feb 7, 2024

I pushed a bunch of changes suggested during the review over on nvim-treesitter. I think those make sense to have here as well -- it's much easier for me if the two do not differ too widely from each other.

@pascalkuthe pascalkuthe merged commit a1272bd into helix-editor:master Feb 7, 2024
6 checks passed
@hunger hunger deleted the switch-slint branch February 7, 2024 21:39
@hunger hunger mentioned this pull request Feb 8, 2024
1 task
cosmikwolf pushed a commit to cosmikwolf/helix that referenced this pull request Feb 26, 2024
* slint: Update treesitter parser and queries

* slint: Port over suggestions from nvim review
shortc pushed a commit to shortc/helix that referenced this pull request Mar 31, 2024
* slint: Update treesitter parser and queries

* slint: Port over suggestions from nvim review
postsolar pushed a commit to postsolar/helix that referenced this pull request Apr 4, 2024
* slint: Update treesitter parser and queries

* slint: Port over suggestions from nvim review
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-language-support Area: Support for programming/text languages S-waiting-on-review Status: Awaiting review from a maintainer.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants