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

Merged
merged 128 commits into from
Jul 23, 2024
Merged

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 16 commits April 14, 2024 14:08
**Problem**
Currently operator_identifier includes characters
like colon at and equal even though they cannot be a legal
operator without backticks.
Having equal etc pushes tree-sitter into thinking some
construct to be an infix operation when they are `=`.

Another compilication is Unicode Math symbols,
which includes equal sign.

**Solution**
Remove colon, at, equal sign, and Math symbols from the
single-char operator_identifier.
This adds back back a few Math symbol unicodes.
Exclude colon, at, and equal from single opchar
chore: generate and sync latest changes
chore: generate and sync latest changes
**Problem**
We currently use scala/scala and scala/scala3 to run the smoke test,
but the versions are slightly older.

**Solution**
1. This bumps the versions to latest. Thankfully not much regression on the percentage.
2. This also adds lila for testing.
**Problem/Solution**
I noticed that corpus tests weren't running.
Apparently tree-sitter 0.22.0 moved the directory -https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.0
refactor(scanner): use new array header for stack
# Conflicts:
#	vendored_parsers/tree-sitter-scala/queries/scala/highlights.scm
@hugo-vrijswijk
Copy link
Contributor Author

@Wilfred could you have a look at this? :)

@Wilfred Wilfred merged commit 954979b into Wilfred:master Jul 23, 2024
13 checks passed
@Wilfred
Copy link
Owner

Wilfred commented Jul 23, 2024

Looks good, thanks!

@hugo-vrijswijk hugo-vrijswijk deleted the update-scala-treesitter branch July 23, 2024 14:47
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.