Skip to content

chore: generate latest changes #135

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

Merged
merged 1 commit into from
Jan 12, 2023
Merged

Conversation

ckipp01
Copy link
Collaborator

@ckipp01 ckipp01 commented Jan 12, 2023

Generated from fd05f09

ckipp01 added a commit to ckipp01/nvim-treesitter that referenced this pull request Jan 12, 2023
There has been a lot of changes recently to the Scala grammar and we've
been merging in a handful of things before syncing the actual generated
parser. We are currently at a stage where we're going to sync
everything, but there are some breaking changes that are included in
tree-sitter/tree-sitter-scala#135, so when that
commit gets synced here stuff will break. We've taken the queries that
existed here and have been building off of them in the actual upstream
repo. This will hopefully make the transition smooth and updates the
queries to ensure that there is no breakage. It's recommended to wait
until that pr is merged, synced here, and then merge this in around the
same time.

Co-authored-by: eugene yokota <[email protected]>
Co-authored-by: Anton Sviridov <[email protected]>
@ckipp01 ckipp01 requested review from keynmol and eed3si9n January 12, 2023 12:00
@ckipp01
Copy link
Collaborator Author

ckipp01 commented Jan 12, 2023

I've also created nvim-treesitter/nvim-treesitter#4153 to sync everything.

@ckipp01 ckipp01 merged commit 47767fc into tree-sitter:master Jan 12, 2023
@ckipp01 ckipp01 deleted the generationThrice branch January 12, 2023 12:03
ckipp01 added a commit to ckipp01/nvim-treesitter that referenced this pull request Jan 12, 2023
There has been a lot of changes recently to the Scala grammar and we've
been merging in a handful of things before syncing the actual generated
parser. We are currently at a stage where we're going to sync
everything, but there are some breaking changes that are included in
tree-sitter/tree-sitter-scala#135, so when that
commit gets synced here stuff will break. We've taken the queries that
existed here and have been building off of them in the actual upstream
repo. This will hopefully make the transition smooth and updates the
queries to ensure that there is no breakage. It's recommended to wait
until that pr is merged, synced here, and then merge this in around the
same time.

Co-authored-by: eugene yokota <[email protected]>
Co-authored-by: Anton Sviridov <[email protected]>
ckipp01 added a commit to ckipp01/nvim-treesitter that referenced this pull request Jan 12, 2023
There has been a lot of changes recently to the Scala grammar and we've
been merging in a handful of things before syncing the actual generated
parser. We are currently at a stage where we're going to sync
everything, but there are some breaking changes that are included in
tree-sitter/tree-sitter-scala#135, so when that
commit gets synced here stuff will break. We've taken the queries that
existed here and have been building off of them in the actual upstream
repo. This will hopefully make the transition smooth and updates the
queries to ensure that there is no breakage. It's recommended to wait
until that pr is merged, synced here, and then merge this in around the
same time.

Co-authored-by: eugene yokota <[email protected]>
Co-authored-by: Anton Sviridov <[email protected]>
ckipp01 added a commit to ckipp01/nvim-treesitter that referenced this pull request Jan 14, 2023
There has been a lot of changes recently to the Scala grammar and we've
been merging in a handful of things before syncing the actual generated
parser. We are currently at a stage where we're going to sync
everything, but there are some breaking changes that are included in
tree-sitter/tree-sitter-scala#135, so when that
commit gets synced here stuff will break. We've taken the queries that
existed here and have been building off of them in the actual upstream
repo. This will hopefully make the transition smooth and updates the
queries to ensure that there is no breakage. It's recommended to wait
until that pr is merged, synced here, and then merge this in around the
same time.

Co-authored-by: eugene yokota <[email protected]>
Co-authored-by: Anton Sviridov <[email protected]>
ckipp01 added a commit to ckipp01/nvim-treesitter that referenced this pull request Jan 14, 2023
There has been a lot of changes recently to the Scala grammar and we've
been merging in a handful of things before syncing the actual generated
parser. We are currently at a stage where we're going to sync
everything, but there are some breaking changes that are included in
tree-sitter/tree-sitter-scala#135, so when that
commit gets synced here stuff will break. We've taken the queries that
existed here and have been building off of them in the actual upstream
repo. This will hopefully make the transition smooth and updates the
queries to ensure that there is no breakage. It's recommended to wait
until that pr is merged, synced here, and then merge this in around the
same time.

Co-authored-by: eugene yokota <[email protected]>
Co-authored-by: Anton Sviridov <[email protected]>
ckipp01 added a commit to ckipp01/nvim-treesitter that referenced this pull request Jan 14, 2023
There has been a lot of changes recently to the Scala grammar and we've
been merging in a handful of things before syncing the actual generated
parser. We are currently at a stage where we're going to sync
everything, but there are some breaking changes that are included in
tree-sitter/tree-sitter-scala#135, so when that
commit gets synced here stuff will break. We've taken the queries that
existed here and have been building off of them in the actual upstream
repo. This will hopefully make the transition smooth and updates the
queries to ensure that there is no breakage. It's recommended to wait
until that pr is merged, synced here, and then merge this in around the
same time.

Co-authored-by: eugene yokota <[email protected]>
Co-authored-by: Anton Sviridov <[email protected]>
theHamsta pushed a commit to nvim-treesitter/nvim-treesitter that referenced this pull request Jan 14, 2023
There has been a lot of changes recently to the Scala grammar and we've
been merging in a handful of things before syncing the actual generated
parser. We are currently at a stage where we're going to sync
everything, but there are some breaking changes that are included in
tree-sitter/tree-sitter-scala#135, so when that
commit gets synced here stuff will break. We've taken the queries that
existed here and have been building off of them in the actual upstream
repo. This will hopefully make the transition smooth and updates the
queries to ensure that there is no breakage. It's recommended to wait
until that pr is merged, synced here, and then merge this in around the
same time.

Co-authored-by: eugene yokota <[email protected]>
Co-authored-by: Anton Sviridov <[email protected]>
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.

2 participants