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

update scala treesitter #659

Open
wants to merge 113 commits into
base: master
Choose a base branch
from

Conversation

hugo-vrijswijk
Copy link
Contributor

@hugo-vrijswijk hugo-vrijswijk commented Mar 14, 2024

No description provided.

web-flow and others added 30 commits June 13, 2023 05:03
chore: generate and sync latest changes
chore: generate and sync latest changes
chore: generate and sync latest changes
Old test used to pass due to `lua-match` predicates not being run with `tree-sitter` command
Use match? instead of lua-match? for queries
Add "conditional" to `case` in `indented_cases`
…olation

fix: handle interpolations without spaces and $$ in interpolated strings
Problem
-------
Scala 2 macro definition is not supported.

Solution
--------
This adds macro_body as an expression.
chore: generate and sync latest changes
chore: generate and sync latest changes
eed3si9n and others added 26 commits January 2, 2024 12:27
…ions/dot-github/workflows/tj-actions/verify-changed-files-17

chore(deps): bump tj-actions/verify-changed-files from 13 to 17 in /.github/workflows
chore: generate and sync latest changes
Allow $.function_declaration as extension body
chore: generate and sync latest changes
Previously the character literal was updated
mimicking that of Rust apparently,
but Scala doesn't have curly braces in the character literal.

We do, however, support two 'u' characters.
tree-sitter now uses last-wins rules for highlighting.
This moves the rules around to match the older highlighting.
Except operator, which I've now let it take precedence over `function.call`.
chore: generate and sync latest changes
…cala-treesitter

# Conflicts:
#	vendored_parsers/tree-sitter-scala/queries/scala/highlights.scm
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.

None yet