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

highlight(scala): update the Scala highlight queries #5546

Merged
merged 1 commit into from
Jan 16, 2023

Conversation

eed3si9n
Copy link
Contributor

There have been a lot of changes in tree-sitter/tree-sitter-scala, including partial support for Scala 3 syntax and breaking changes in some of the nodes.

This bumps up the grammar to the latest, and adjusts the queries.

before

baseline_helix

after

helix_1

Co-authored-by: Anton Sviridov keynmol@gmail.com
Co-authored-by: Chris Kipp ckipp@pm.me

There have been a lot of changes in tree-sitter/tree-sitter-scala,
including partial support for Scala 3 syntax and breaking changes in
some of the nodes.

This bumps up the grammar to the latest, and adjusts the queries.

Co-authored-by: Anton Sviridov <keynmol@gmail.com>
Co-authored-by: Chris Kipp <ckipp@pm.me>
@eed3si9n
Copy link
Contributor Author

/cc @ckipp01, @keynmol

@ayoub-benali
Copy link
Contributor

Thanks for your work on scala tree sitter again 🙏
Hopefully this fixes #4352

@eed3si9n
Copy link
Contributor Author

Yea. If not please feel free to redirect the issue to https://github.com/tree-sitter/tree-sitter-scala

@eed3si9n eed3si9n marked this pull request as draft January 15, 2023 23:31
@eed3si9n eed3si9n marked this pull request as ready for review January 15, 2023 23:51
@the-mikedavis
Copy link
Member

Yep looks like this fixes #4352

@the-mikedavis the-mikedavis linked an issue Jan 16, 2023 that may be closed by this pull request
@the-mikedavis the-mikedavis merged commit 6f6334f into helix-editor:master Jan 16, 2023
@eed3si9n eed3si9n deleted the wip/query branch January 16, 2023 15:50
gibbz00 pushed a commit to gibbz00/helix that referenced this pull request Jan 17, 2023
There have been a lot of changes in tree-sitter/tree-sitter-scala,
including partial support for Scala 3 syntax and breaking changes in
some of the nodes.

This bumps up the grammar to the latest, and adjusts the queries.

Co-authored-by: Anton Sviridov <keynmol@gmail.com>
Co-authored-by: Chris Kipp <ckipp@pm.me>
kirawi pushed a commit to kirawi/helix that referenced this pull request Jan 25, 2023
There have been a lot of changes in tree-sitter/tree-sitter-scala,
including partial support for Scala 3 syntax and breaking changes in
some of the nodes.

This bumps up the grammar to the latest, and adjusts the queries.

Co-authored-by: Anton Sviridov <keynmol@gmail.com>
Co-authored-by: Chris Kipp <ckipp@pm.me>
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.

Scala syntax highlighting is slightly broken
3 participants