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

Add Groovy grammar #9350

Merged
merged 6 commits into from
Feb 19, 2024
Merged

Add Groovy grammar #9350

merged 6 commits into from
Feb 19, 2024

Conversation

chernetskyi
Copy link
Contributor

@chernetskyi chernetskyi commented Jan 16, 2024

Closes #4211
Took queries from nvim-treesitter.

runtime/queries/groovy/highlights.scm Show resolved Hide resolved
runtime/queries/groovy/highlights.scm Outdated Show resolved Hide resolved
@the-mikedavis the-mikedavis added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. A-language-support Area: Support for programming/text languages labels Jan 16, 2024
the-mikedavis
the-mikedavis previously approved these changes Jan 16, 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. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 16, 2024
@britter
Copy link
Contributor

britter commented Feb 17, 2024

@chernetskyi any chance to get he merge conflicts resolved?

chernetskyi and others added 4 commits February 19, 2024 17:27
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
@chernetskyi
Copy link
Contributor Author

@chernetskyi any chance to get he merge conflicts resolved?

Done. Hopefully, it will be merged soon, so no new conflicts can appear.

languages.toml Outdated Show resolved Hide resolved
languages.toml Outdated Show resolved Hide resolved
@pascalkuthe pascalkuthe merged commit 990378a into helix-editor:master Feb 19, 2024
6 checks passed
@britter
Copy link
Contributor

britter commented Feb 20, 2024

It looks like nvim-treesitter switched to a more complete parser just recently: nvim-treesitter/nvim-treesitter@d4dac52 Should we update helix with these changes as well?

@the-mikedavis
Copy link
Member

Feel free to open up a PR switching the parser and queries if it's an improvement

@britter
Copy link
Contributor

britter commented Feb 20, 2024

@the-mikedavis here you go! #9677

uek-1 pushed a commit to uek-1/helix that referenced this pull request Feb 24, 2024
* Add Groovy grammar

* Rewrite Neovim captures into Helix for Groovy

* Simplify Groovy injections

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Remove Neovim's spell from Groovy highlights

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Apply suggestions to languages.toml

* Escape backslash in groovy highlights.scm

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
shortc pushed a commit to shortc/helix that referenced this pull request Mar 31, 2024
* Add Groovy grammar

* Rewrite Neovim captures into Helix for Groovy

* Simplify Groovy injections

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Remove Neovim's spell from Groovy highlights

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Apply suggestions to languages.toml

* Escape backslash in groovy highlights.scm

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
postsolar pushed a commit to postsolar/helix that referenced this pull request Apr 4, 2024
* Add Groovy grammar

* Rewrite Neovim captures into Helix for Groovy

* Simplify Groovy injections

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Remove Neovim's spell from Groovy highlights

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Apply suggestions to languages.toml

* Escape backslash in groovy highlights.scm

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
mtoohey31 pushed a commit to mtoohey31/helix that referenced this pull request Jun 2, 2024
* Add Groovy grammar

* Rewrite Neovim captures into Helix for Groovy

* Simplify Groovy injections

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Remove Neovim's spell from Groovy highlights

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>

* Apply suggestions to languages.toml

* Escape backslash in groovy highlights.scm

---------

Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
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.

Add syntax definition / highlight for Groovy, specifically Jenkinsfiles
4 participants